GEM:60 fixed the fuckin merge mistake
Merge branch 'master' into web/lbkstudios/32
GEM:32 made some small changes