logged in status
Merge branch 'master' of https://github.com/meekr/CPSE

Conflicts:
	CPSE/Controllers/Account/LoginViewController.m