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 'release/1.6.0'
Merge branch 'master' of https://github.com/akvo/akvo-flow into feature/dashboard_test
Small additions