Merge branch 'development' of https://github.com/nicekiwi/southern-eastercamp into development

Conflicts:
public/css/app.css
public/scss/app.scss
Resolve Conflict