laucher and home layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/login.xml
laucher and home layout