(lol minor parameter mod)
Merge remote-tracking branch 'origin/master'

Conflicts:
	demo/js/main.coffee
	demo/js/main.js
	dist/yaya.js
(rebuild)