change findlayout(R.id.*)
Merge branch 'master' of https://github.com/pffair/wjw

Conflicts:
	res/layout/activity_register.xml