Merge branch 'new_challengeEngine'

# By Stefan Staub (1) and Ursin Brunner (1)
# Via Stefan Staub
* new_challengeEngine:
  fixed timeline entry appending
  added new challengeEngine and make it compile. But is not working as expected.

Conflicts:
	DralloLibrary/ScreenControllers/DralloDetailsController/DralloDetailsController.cs
fix build errors after merge
don’t embed assembles into apk (currently it breaks localization)
[filter fragment] added dumb way to get a context when there’s no activity and view
Merge branch 'DA-319' into unstable

* DA-319:
  [filter fragment] added dumb way to get a context when there’s no activity and view
  don’t embed assembles into apk (currently it breaks localization)
  fix build errors after merge
  Merge branch 'new_challengeEngine'