portfolioEditor commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/js/controllers/portfolioEditor.js
	app/libs/kendo/js/kendo.custom.js
	app/main.js
	app/partials/portfolioEditor.html