Issue #177 - Recover code deleted in the merge
Issue #280 - Reuse the version name from AndroidManifest.xml

Get rid of the version name in res/strings.xml in order to reuse the
same attribute from AndroidManifest.xml. When checking for new versions
or displaying app info to the user, the version name will be the one in
the manifest, allowing us to maintain a single value across the app.
Issue #294 - Generate a version using git describe

* Generate a version using git describe and use it for replace
  a the token __VERSION__ in the generated app.js
Issue #280 - Include header in new Java class
Merge branch 'develop' into feature/surveyreload