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

Conflicts:
	res/layout/main.xml
Merge branch 'master' of https://github.com/grujo/myRiver

Conflicts:
	res/layout/main.xml
Merge branch 'master' of https://github.com/grujo/myRiver

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