User_add deleted
Merge branch 'master' of github.com:Gluewine/Gluewine

Conflicts:
	imp/examples/GluewineExampleApp/cfg/gluewine.state
	imp/examples/GluewineExampleApp/src/gluewine/hibernate/UserService.java