Initial commit
Merge branch 'master' of github.com:krisboud/open-dev into develop