Styles
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/app/scripts/loadblocks.php
Merge branch 'master' of https://github.com/CompraBV/onepage

Conflicts:
	assets/app/scripts/loadblocks.php