Merge branch 'master' of github.com:Tuxion/mokuji
Removed JSON_UNESCAPED_UNICODE from core/Router.php
to maintain backwards compatibility.
Hotfix for the settings update method.

Fixes #70
Merged pull request #71 branch 'hotfix/0.30.1' into release-0.31.0

Conflicts:
	CHANGES.md
	README.md