Merge branch 'master' into marty
Merge branch 'master' into marty
Removed some alerts and added Auto Login
Merge branch 'marty'