Template & css changes
Merge branch 'master' of https://github.com/p2v2/wptheme