initial
Merge branch 'develop' of github.com:mshibata/publ

Conflicts:
    .gitignore