[Oct 6]
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/thewhiteboard/db/HabitsContract.java
	src/com/thewhiteboard/ui/Activities/HabitDetailActivity.java
	src/com/thewhiteboard/ui/Fragments/CalendarTileFragment.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/thewhiteboard/ui/Activities/FrontPageActivity.java
	src/com/thewhiteboard/ui/Activities/NewNoteActivity.java
[Oct 11]