merge test
Merge branch 'master' of https://github.com/157688302/rejuvenation.git

Conflicts:
	src/com/rejuvenation/MainActivity.java