Creating template
Creating template
web
web
Merge branch 'master' of ssh://gmail-ilch.rhcloud.com/~/git/gmail
Merge branch 'master' of ssh://hotmail-ilch.rhcloud.com/~/git/hotmail

Conflicts:
	pom.xml