From WebServer
From WebServer
Merge branch 'master' of github.com:kakitsubun/endlessland2

Conflicts:
	app/controllers/TestController.php
	app/views/index/index.volt