Merge pull request #162 from wagnert/master

Switch to new version 0.6.0beta3
Add refactored api/admin apps
Merge branch 'techdivision'