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

Conflicts:
	app/controllers/userController.py
aa
Merge branch 'master' of https://github.com/BGordts/peno3_iStudyPlus