GEtting values from the hourpicker
Merge remote-tracking branch 'origin/dev' into alarm-dev

Conflicts:
	src/edu/uml/code/activityreminder/ConfigureActivity.java