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

Conflicts:
	app/templates/pages/dashboard.html