.
Merge branch 'develop' of https://github.com/andersd/Cyan into develop

Conflicts:
	cyan/assets/css/cyan-admin.css