"Add activity" modal added

"Add activity" modal added
"Add activity"-view added
Merge branch 'master' of https://github.com/estan/iprog14-project

Conflicts:
	index.html
	js/app.js
	js/model/model.js