Creating template
Commit from JBoss Tools
Commit from JBoss Tools
update home
t
security done
sdd
commit security updated
password with sha
test
4
Gran update db andando, jasperreport no
db openshift
db xml
db annamac
db app name
db app name
ss
dd
Merge branch 'master' of
ssh://520abdf250044646920000ca@invoice-alvarovm.rhcloud.com/~/git/invoice.git/

Conflicts:
	src/main/webapp/WEB-INF/spring/invoice-hibernate.xml