Merge branch 'master' of github.com:DarkSearinoX/webmultical

Conflicts:
	compilation_cache/43/76/6075a0df66d00bbc664f5482d9afd1f77b6aaf84c108f5219e43d2ff926f.php
	compilation_cache/a7/94/6129bd273f15dfe2b6c38176d303625cf7a1749ed6f3ec0e818fd98100fe.php
Merge branch 'master' of github.com:DarkSearinoX/webmultical
Merge branch 'master' of github.com:DarkSearinoX/webmultical