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

Conflicts:
	main.wire
resolved conflicts
Merge branch 'master' into Dustin