Standardize the redirects
Merge conflict fix
Issue #216

Trying to save the date correctly in the db
Merge dev to feature_active_checkboxes