This has new CIEE icon
This has CIEE icon
This has icon
This has icon CIEE
This has icon CIEE
Merge branch 'alerts'
This has icon CIEE
Merge branch 'alerts'
Merge branch 'master' of https://github.com/cjnice/SummerApp.git

Conflicts:
	BrandeisApp/assets/www/index.html
	BrandeisApp/bin/BrandeisApp.apk
	BrandeisApp/bin/classes.dex
	BrandeisApp/bin/resources.ap_