Prepared for localnet testing and migration.
Merge branch 'master' of https://github.com/eustasy/midoribrowser.org

Conflicts:
	chunks/style.css