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

Conflicts:
	AddsIncGAE/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml