Code
Merge branch 'master' of https://github.com/BGordts/peno3_iStudyPlus

Conflicts:
	app/static/js/dashboard.js
	app/templates/pages/navigation.html