first commit
Merge https://github.com/jiviapp/jivi into gh-pages