upgrade wordpress & theme
Merge branch 'master' of https://github.com/felixup/wpdev