Fixed a lot of things broken by merge
Merge branch 'master' of https://github.com/cedeo/wimtvpro-wordpress