daily commit
Merge branch 'master' of https://github.com/StanDimitroff/TEAM-KILGHARRAH

Conflicts:
	Resources/styles/home-page.css