change password
Merge branch 'master' of github.com:gjq1218/ducking-octo-bugfixes

Conflicts:
	src/struts.xml
change password!