Added username and mail for git
Merge branch 'develop' of https://github.com/xsurfer/jbossas-7-cloudtm into develop