Fix server for 5.2.17 php version
Merge branch 'master' of https://github.com/DENIELER/coffeeGame

Conflicts:
	src/app/pages/register/register.html
Merge branch 'master' of https://github.com/DENIELER/coffeeGame