Commit before pulling latest changes
Merge branch 'master' of github.com:sethbusque/offensely

Conflicts:
	protected/views/site/login_atms.php
Fixed session bug