Changes by KaspYar

Added new db connection
added bootstrap
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
	webapp/webapp.iml