stash
Merge branch 'password_reset' of github.com:ivangsa/appfuse into password_reset

Conflicts:
	web/gwt/src/main/java/org/appfuse/webapp/client/requests/UserRequest.java
	web/gwt/src/main/java/org/appfuse/webapp/client/ui/users/updatePassword/UpdatePasswordActivity.java
	web/gwt/src/main/java/org/appfuse/webapp/server/services/impl/UserRequestServiceImpl.java