Sync
Merge branch 'master' of https://github.com/Symantis/Symantis.org

Conflicts:
	assets/styles/app.css