Yep
Merge branch 'master' of https://github.com/blade1989/EuroCMS

Conflicts:
	stylesheets.php