UI redesign
Merge branch 'geofences' into Development

Conflicts:
	Drop/src/com/example/drop/EditNoteScreen.java