live commit
Merge branch 'master' of https://github.com/bamboocreative/velocity
Merge branch 'master' of https://github.com/bamboocreative/velocity
live server updates
Merge branch 'master' of ssh://github.com/bamboocreative/velocity