Here we go again with css files from build
Merge branch 'hotfix/v1.0.3'

Conflicts:
	css/style.css
Ugly motherfucker
Merge branch 'hotfix/v1.0.4' into develop