fix
Merge branch 'master' of https://github.com/patrykos91/Laikos

Conflicts:
	Laikos/LaikosContent/LaikosContent.contentproj
fix