Merge branch 'master' of https://github.com/erezgiga/cloudify-widget-skins

Conflicts:
	.jshintrc