initial commit
adding submodules
Merge branch 'master' into gh-pages