META-320, little minor modification that was left behind lurking. (bare if/else loop for figuring is it one student or csv add)
Merge branch 'devel' of github.com:Meta-arviointi/meta-arviointi into devel

Conflicts:
	app/Controller/CoursesController.php
	app/View/Courses/index.ctp
	app/webroot/js/application.js
improved modals
Merge branch 'devel' of github.com:Meta-arviointi/meta-arviointi into devel

Conflicts:
	app/webroot/css/meta.css
Merge branch 'devel' of github.com:Meta-arviointi/meta-arviointi into devel

Conflicts:
	app/Controller/CoursesController.php
	app/webroot/js/application.js
fixed login redirect
Merge branch 'devel' of github.com:Meta-arviointi/meta-arviointi into devel
For some unknown reason CoursesController/add function had vanished - reinstated
Same thing happened to StudentsController/add from csv skeleton parts - reinstated
Fixes to move functionality from view to controller
Merge branch 'devel' of github.com:Meta-arviointi/meta-arviointi into devel
coursemembership comment edit form, closes #25
Merge branch 'devel' of github.com:Meta-arviointi/meta-arviointi into devel
fixing failed merge
fixing failed merge, part II
Get groups & assistants by course
Students csv add diipadaa. :-p
implementing file upload functionality
Merge branch 'devel' of github.com:Meta-arviointi/meta-arviointi into devel
Merge branch 'devel' of github.com:Meta-arviointi/meta-arviointi into devel

Conflicts:
	app/Controller/StudentsController.php
csv upload tiny tiny bit further - stalling due missing format of the csv file.