s
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/layout_login.xml
	src/com/jerome/mighty/data/dao/AccountDaoHelper.java