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

Conflicts:
	app/controllers/sessionController.py
	app/database/test.db
	app/models/session.py