Merge
Merge branch 'master' of https://github.com/toriijs/torii.js

Conflicts:
	routes/action.js