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
Merge branch 'hotfix/0.30.1' into develop

Conflicts:
	CHANGES.md
	README.md