merge
Merge branch 'master' of http://github.com/GUDDI/app.git
config email