grab
Merge branch 'master' of https://github.com/khisakuni/Rewards

Conflicts:
	res/layout/login.xml