Merge pull request #19 from ambitioninc/develop

Merge develop
Update version.py
added admin
updated admin, tests
Merge pull request #20 from jmcriffey/develop

User Guide Admin