change package name
Merge remote-tracking branch 'origin/Jonny'sGUI' into Jonny'sGUI

Conflicts:
	res/layout/dialog_resetpassword.xml
change icon