cean up
Merge branch 'master' of https://github.com/thedoers/thedoers

Conflicts:
	.idea/workspace.xml
	source/js/vendor/blurscript.jsx