trash interim
bundle update
Merge branch 'feature/TheRole' into develop
added activeadmin gem and support for travis-ci
Merge branch 'release/0.0.2'
travis-ci
merge branch 'hotfix/0.0.2.1'