android
Merge branch 'master' of
https://github.com/VurtneWk/RiversAndLakesAndriod.git

Conflicts:
	bin/classes/com/riversandlakes/core/BaseActivity.class