Merge branch 'playereditor-master' of https://github.com/HGustavs/LenaSYS_2014 into playereditor-master

Conflicts:
	PlayerEditor/CanvasWrapper/js/CanvasWrapper.js