Merge branch 'develop' into release/1.7.0
Merge branch 'develop' into release/1.7.0
Merge pull request #618 from akvo/develop

Merge [#368] for 1.7.0 release
[#585] Replacing imported JSON writing sources

* Replacing the imported JSON writing utilities
(https://github.com/akvo/akvo-flow/tree/develop/GAE/src/org/waterforpeople/mapping/app/util/json)
[#585] Deleting json.jar library + imported JSON source files
Merge pull request #627 from akvo/develop

[#625] Merging fix for survey overview link to release/1.7.0
[#629] List all survey groups in assignment list

* When monitoring enabled we need to repopulate the entire survey group list
Merge pull request #630 from akvo/issue/629

[#629] List all survey groups in assignment list
[#556] Solve NPE when SurveyedLocale has no geocells set
[#619] Insert version number 1.0 on Dashboard for new survey

* Initial version number is set in Dashboard for new surveys.  This is mostly for display purposes as the version number calculation happens in the application (GAE)
[#619] Increment new survey version number
[#619] Do not increment survey version number during survey publish
[#619] Reset survey version number when copying survey
[#619] Default version number when retrieving surveys

* Applies to the actions list all surveys, list surveys in survey group and list single survey. In the previous setup we did not set a survey version on first creating survey. In these cases the survey default version number is set when we retrieve the survey.
[#619] Increment version number when editing published survey
Merge pull request #632 from akvo/issue/556

[#556] Solve NPE when SurveyedLocale has no geocells set
[#619] Instantiate with Double literal
Merge pull request #636 from akvo/issue/619

[#619] Survey version number is not consistent between dashboard and published versions on devices
[#585] Remove unused import and new line
Merge pull request #628 from akvo/issue/585

[#585] Cleaning up JSON* classes