Merge branch 'develop' into feature-editLocationTitle

Conflicts:
	res/values/strings.xml
Merge pull request #5 from eugene-sedykh/feature-editLocationTitle

Added ability to modify location title
Merge branch 'develop' into feature-deleteLocationRemote

Conflicts:
	res/values/strings.xml