Flyttat vyerna så att angular hanterar dessa
slagit isär controllers
flyttat vyer
Merge branch 'Convert-to-Angular' of https://github.com/jhasselgren/Secretary into Convert-to-Angular

Conflicts:
	src/main/webapp/resources/views/bullet/create.html
	src/main/webapp/resources/views/bullet/edit.html
	src/main/webapp/resources/views/event/Copy of show_angular.html
	src/main/webapp/resources/views/event/create.html
	src/main/webapp/resources/views/event/edit.html
	src/main/webapp/resources/views/event/show.html
	src/main/webapp/resources/views/event/show_angular.html
	src/main/webapp/resources/views/index.html
	src/main/webapp/resources/views/layout.html
	src/main/webapp/resources/views/layout_old.html
	src/main/webapp/resources/views/main.html
	src/main/webapp/resources/views/project/edit.html
	src/main/webapp/resources/views/project/list.html
	src/main/webapp/resources/views/project/show.html
	src/main/webapp/resources/views/project/test.html
	src/main/webapp/resources/views/subject/create.html
	src/main/webapp/resources/views/subject/edit.html