Add忘れ。
Merge branch 'master' of https://github.com/Alfr0475/Meelia

Conflicts:
	core/controller.class.php
	meelia.php
	tests/bootstrap.php