Removed unnecessary line break
Merge branch 'develop'

Conflicts:
	less/entepe.less
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	css/entepe.css
Changed stylesheet to proper version
Fixed some minor styling problems
Merge branch 'hotfix/v1.0.1' into develop