layout register
Merge branch 'master' of https://github.com/farahs/MWallet

Conflicts:
	res/layout/activity_register.xml