commit changed
Merge branch 'master' of https://github.com/cloverstudio/Spika-Server

Conflicts:
	config/init.php
Merge branch 'master' of https://github.com/cloverstudio/Spika-Server

Conflicts:
	src/Spika/Controller/AsyncTaskController.php
	src/Spika/Controller/SpikaBaseController.php
	src/Spika/Controller/Web/StaticPageController.php