WIP
WIP
Merge branch 'new_angular_version_api_tests' of https://github.com/this-is-peeps/Backend into new_angular_version_api_tests

Conflicts:
	backend/webapp/app/index.html
	backend/webapp/app/js/app.js
	backend/webapp/app/partials/home/infoboard/infoboard.html
	backend/webapp/app/partials/home/infoboard/infoboard.js
	backend/webapp/app/services/infoboardService.js
fix merge and missing scripts in index.html