change for re-merging to dev_1.0
Re-merge to bug fix day 12
Change for re merge 2
Remerge to bug fix day 12 2
Add changes to all java files
Re-merge to bug fix day 12 3
Add change to alarm
Merge branch 'dev_1.0_BugFix_Day12' into dev_1.0
add changes to alarm, alarm helper, and settings cursor
Re-Merge branch 'dev_1.0_BugFix_Day12' into dev_1.0 4

Conflicts:
	CrazyAlarm/src/com/grouapp/crazyalarm/Alarm.java
	CrazyAlarm/src/com/grouapp/crazyalarm/AlarmHelper.java
	CrazyAlarm/src/com/grouapp/crazyalarm/AlarmSettingsCursor.java
Change twitter and settings fragment
Change share activity for build
ReMerge branch 'dev_1.0_BugFix_Day12' into dev_1.0 5

Conflicts:
	CrazyAlarm/src/com/grouapp/crazyalarm/AlarmSettingsFragment.java
	CrazyAlarm/src/com/grouapp/crazyalarm/TwitterInstanceHolder.java
Change timepicker
Update ShareActivity imports
ReMerge branch 'dev_1.0_BugFix_Day12' into dev_1.0 6

Conflicts:
	CrazyAlarm/src/com/grouapp/crazyalarm/TimePickerFragment.java
Commit for R.txt before checkout to bug fix day 12
Update res folder
Update Main Settings Fragment
Fixed remaining bugs after remerging to bug fix day 12