alerts work in progress
project file change for adding alerts
Conflicts:
	MIT Mobile.xcodeproj/project.pbxproj
updating alerts UI
remove auto generated header

remove auto generated header
remove auto generated header

remove auto generated header
Merge pull request #481 from MIT-Mobile/3.6-dev-scanner-merge

Merging latest scanner work into 3.6 dev