temp changes
Merge branch 'master' of https://github.com/stevesun112/5115UIproject

Conflicts:

SmartAlarmApp/src/com/bicrement/plugins/localNotification/AlarmReceiver.
java
	SmartAlarmApp/src/com/phonegap/SmartAlarmApp/SmartAlarmApp.java