EditUser
Merge branch 'master' of
https://github.com/globant/googleappengine-training.git

Conflicts:
	AddsIncGAE/src/com/globant/gaetraining/addsincgae/controllers/UserController.java
Merge branch 'master' of https://github.com/globant/googleappengine-training.git