Creating template
Merge branch 'master' of ssh://bondimalo-nisevi.rhcloud.com/~/git/bondimalo

Conflicts:
	README.md
	pom.xml

adding openshift
pull from openshift
adding file structure
delete of unnecessary module
update of gitignore file
Merge branch 'master' of github.com:nisevi/bondimalo

Conflicts:
	pom.xml