readded project
Merge branch 'master' into gh-pages

Conflicts:
	bin-debug/Main.swf