Merge branch 'master' of https://github.com/jasalt/gko-node-webkit

Conflicts:
	taskeditor/directives/answer-text-box.html
Mergefail branch crap 'master' of https://github.com/jasalt/gko-node-webkit

Conflicts:
	taskeditor/directives/answer-text-box.html