Various bug fixes
Merge branch 'master' of https://github.com/BGordts/peno3_iStudyPlus

Conflicts:
	app/static/js/dashboard.js
	app/templates/pages/dashboard_profile-info.html
	app/templates/pages/login.html
	app/templates/pages/navigation.html
	app/templates/pages/settings_page.html
Minor change
Merge branch 'master' of https://github.com/BGordts/peno3_iStudyPlus
Merge branch 'master' of https://github.com/BGordts/peno3_iStudyPlus
Merge branch 'master' of https://github.com/BGordts/peno3_iStudyPlus

Conflicts:
	app/static/js/dashboard.js
+

When a user has started a session, he can't go nowhere :)
Merge branch 'master' of https://github.com/BGordts/peno3_iStudyPlus

Conflicts:
	app/static/js/dashboard.js
Starting to make the selector work