Merge branch 'master' of https://github.com/simerek/gp_christmas

Conflicts:
	views/Index.php
	web/index.php