Merge branch 'master' of https://github.com/PotatoRental/WebAim

Conflicts:
	src/main/java/com/aim/controller/CoursesController.java
Merge branch 'master' of https://github.com/PotatoRental/WebAim
Added in place editing for surveys
Added in place editing for minutes.