fix android part
Merge branch 'DA-313' of github.com:ChallengeEarth/drallo-app into DA-313

# By rzaitov
# Via rzaitov
* 'DA-313' of github.com:ChallengeEarth/drallo-app:
  <DA-313> fix ios merge
fix localisation and build (android)

/Users/Superman/Projects/drallo-app/DralloAndroid/AssetsPathResolver.cs
/Users/Superman/Projects/drallo-app/DralloAndroid/Common/Providers/ControllerProvider.cs