Merge branch 'develop_android' into develop
Merge branch 'develop_android' into develop
Merge branch 'develop'
some bugs fixed
some bugs fixed
CheckBox at Visit_Task Add, some translation
Issue 292 fixed
Change NavigationBar
Merge remote-tracking branch 'origin/develop_IOS' into responsive_design

Conflicts:
	Demo2/d/resource/app/Screen/ScheduledVisits.xml
	Demo2/d/resource/app/Screen/Visit_Questions.xml
	Demo2/d/resource/app/Screen/Visit_SKU.xml
	Demo2/d/resource/app/Screen/Visit_SKUs.xml
Change .search
Change header
Encashment functionality, part 1
Create design that was tested with android
Create design that was tested with IOS
Encashment functionality, part 2

not completed, but works correctly
Encashment functionality, bugs fixed
Merge remote-tracking branch 'origin/develop_IOS' into responsive_design

Conflicts:
	Demo2/d/resource/app/Style/Default/default.css
Encashment, final part
Change script calling to normal view
Encashment add at Scheduled visit