Added Active Admin functionality
Merge branch 'master' of https://github.com/xTriad/whiteboard