update html/js/css on Android
fix “more entries” button behaviour on Android
remove duplicate timeline.js
Merge branch 'DA-313' into unstable

* DA-313:
  remove duplicate timeline.js
  fix “more entries” button behaviour on Android
  update html/js/css on Android
conversions for point and polyline
conversions for polygon
Merge branch 'DA-348' into unstable

* DA-348:
  conversions for polygon
  conversions for point and polyline
don’t add “more entries” button when adding entries from scratch
Merge branch 'DA-349' into unstable

* DA-349:
  don’t add “more entries” button when adding entries from scratch
<DA-347> update localizations for offline mode
<DA-347> remove unused code
<unstable> Merge branch 'DA-347' into unstable
(iOS) override HitTest in action bar view
Merge branch 'DA-339' into unstable

* DA-339:
  (iOS) override HitTest in action bar view
remove unused variable
<DA-337> write sql query to update challenge state
added new challengeEngine with new MapObjects
startup item = android
Merge commit '8bf433a2ec80f6862a9bafcd5abcfefb287c1bdc' into DA-353

# By Ursin Brunner
# Via Ursin Brunner
* commit '8bf433a2ec80f6862a9bafcd5abcfefb287c1bdc':
  added new challengeEngine with new MapObjects
Merge commit 'fab79c7e6a0bf6e25dd00e7c23de6b1ccd47681e' into DA-350-351-352

# By Ursin Brunner (1) and magicgoose (1)
* commit 'fab79c7e6a0bf6e25dd00e7c23de6b1ccd47681e':
  startup item = android
  added new challengeEngine with new MapObjects