working refresh icon
Merge branch 'master' of https://github.com/andrew749/Hive

Conflicts:
	Hive/app/src/main/java/com/yhacks2014/hive/fragments/TimePickerFragment.java