Merge branch 'master' of https://github.com/felipo-codemarket/Blink-CMS

Conflicts:
	bower.json
Merge branch 'master' of https://github.com/felipo-codemarket/Blink-CMS