some other stuff
Merge branch 'master' of https://github.com/blade1989/EuroCMS

test