Getting the co students: updated and json
Uncommited changes of monday, ik weet het niet meer :s
Merge branch 'master' of https://github.com/BGordts/peno3_iStudyPlus
Completing the api
Merge branch 'master' of https://github.com/BGordts/peno3_iStudyPlus

Conflicts:
	app/templates/pages/navigation.html
dashboard-server.js en dashboard.js gemerged, ook dashboard_profile-info.html en dashboard_profile-info2.html
Naar andere profielen gaan.
Statistics per course + multiple users at once
Merge branch 'master' of https://github.com/BGordts/peno3_iStudyPlus

Conflicts:
	app/controllers/baseController.py
	app/static/js/dashboard.js
Merge branch 'master' of https://github.com/BGordts/peno3_iStudyPlus