save eula
Merge branch 'master' of https://github.com/cloverstudio/Spika-Server
Merge branch 'master' of https://github.com/cloverstudio/Spika-Server
Merge branch 'master' of https://github.com/cloverstudio/Spika-Server
Merge branch 'master' of https://github.com/cloverstudio/Spika-Server
Merge branch 'master' of https://github.com/cloverstudio/Spika-Server
Merge branch 'master' of https://github.com/cloverstudio/Spika-Server
Merge branch 'master' of https://github.com/cloverstudio/Spika-Server
Merge branch 'master' of https://github.com/cloverstudio/Spika-Server
Merge branch 'master' of https://github.com/cloverstudio/Spika-Server
Merge branch 'master' of https://github.com/cloverstudio/Spika-Server
commit local changes
Merge branch 'master' of https://github.com/cloverstudio/Spika-Server

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

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