Update classes
Merge branch 'master' of https://github.com/axc/website2