Merge branch 'development' into time_suggestion
Undoing all of this. It makes no sese.
Merge branch 'time_suggestion' into development
Updating theme