c204
Merge branch 'clean' of github.com:d3orn/hikomsys into clean

Conflicts:
	website/hikomsys/app/views/layouts/default.blade.php
	website/hikomsys/app/views/users/register.blade.php