Update to gen2.5
Merge branch 'master' of github.com:coecms/genesis