Merge branch 'master' of https://github.com/grujo/myRiver

Conflicts:
	AndroidManifest.xml