merged master

Conflicts:
	ch.bfh.swos.bookapp.rest/src/main/webapp/index.html
	ch.bfh.swos.bookapp.rest/src/main/webapp/resources/js/application.js