Bump
Merge branch 'master' of github.com:tMaxx/theOrganizer

Conflicts:
	view/user/login.php