a lot of changes
Merge branch 'master' of https://github.com/sandstroh/meeting-agenda-planner into sandrosbranch

Conflicts:
	js/view/halitTestView.js
Merge pull request #30 from sandstroh/sandrosbranch

a lot of changes