Bugfix
Merge branch 'develop'

Conflicts:
	assets/css/custom.css