Merge bug fixes from master to develop (#1247)

* Fix typo in header (#1152)

* Update Branching Strategy.

* fix 1180 (#1185)

* Update messages.po (POEditor.com)

* added docker size

* Added docker clone counter

* update badges

CONTRIBUTING.md

@@ -21,6 +21,11 @@ We love to hear ideas from other ChurchInfo and ChurchCRM users!  It's what make
 * Check for unnecessary whitespace with `git diff --check` before committing.
 * Changes to ChurchCRM will trigger version number changes in accordance with [Semantic Versioning 2.0.0](http://semver.org/)
 
+## Branching Strategy
+* "Master" branch is evergreen - only peer reviewed, working code should be merged into master.  
+* "Develop" is less strict.  If code is not perfect, but provides adequate functionality, it may be merged into develop.  All known bugs are should have new issues opened so that the issues are tracked.
+*  Features should be developed in a separate branch named accordingly
+
 ## Submitting Changes
 
 * Push your changes to a topic branch in your fork of the repository.
@@ -109,4 +114,4 @@ Please familiarize yourself with the [documentation](http://docs.churchcrm.io/en
 ### JavaScript
 
 * We have a window.CRM object
-    *window.CRM.root represents the  $sRootPath path as defined in Include/Config.php
+    *window.CRM.root represents the  $sRootPath path as defined in Include/Config.php

README.md

@@ -2,10 +2,16 @@ Welcome to Church Web CRM
 ---
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
 [![Documentation Status](https://readthedocs.org/projects/church-web-crm/badge/?version=latest)](https://readthedocs.org/projects/church-web-crm/?badge=latest)
-[![Stories in Ready](https://badge.waffle.io/ChurchCRM/CRM.png?label=ready&title=Ready)](https://waffle.io/ChurchCRM/CRM)
+
+### Development 
+
+[![Stories in Ready](https://badge.waffle.io/ChurchCRM/CRM.png?label=in Review&title=In Review)](https://waffle.io/ChurchCRM/CRM)
 [![Join the chat at https://gitter.im/ChurchCRM/CRM](https://badges.gitter.im/ChurchCRM/CRM.svg)](https://gitter.im/ChurchCRM/CRM?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Build Status](https://travis-ci.org/ChurchCRM/CRM.svg?branch=master)](https://travis-ci.org/ChurchCRM/CRM)
 
+### Docker
+<img src="https://img.shields.io/docker/pulls/churchcrm/crm.svg?maxAge=2592000">
+[![](https://images.microbadger.com/badges/image/churchcrm/crm.svg)](https://microbadger.com/images/churchcrm/crm "Get your own image badge on microbadger.com")
 ## Website
 
 [http://churchcrm.io](http://churchcrm.io)
@@ -35,7 +41,7 @@ To test out the demo, you may login to the http://demo.churchcrm.io  with the fo
 - **Username:** admin
 - **Password:** george
 
-## New Ui.
+## New UI
 
 ![Menu](http://www.churchcrm.io/screenshots/menu.PNG)
 ![Family](http://www.churchcrm.io/screenshots/family.PNG)

src/api/routes/groups.php

@@ -62,6 +62,7 @@
   $this->delete('/{groupID:[0-9]+}', function ($request, $response, $args) {
     $groupID = $args['groupID'];
     GroupQuery::create()->findOneById($groupID)->delete();
+    echo json_encode(array("status"=>"success"));
   });
 
    $this->get('/{groupID:[0-9]+}/members', function ($request, $response, $args) {