no message
Merge branch 'master' of https://github.com/thanhtranduc0706/ATDD

Conflicts:
	ATDD/res/layout/login.xml