Merge branch 'develop' into feature-addLocationDialog

Conflicts:
	res/values/strings.xml
Merge branch 'feature-tabs' into feature-addLocationDialog
Resolved merge conflicts
Merge pull request #8 from eugene-sedykh/feature-addLocationDialog

Feature add location dialog