jon updates
Merge branch 'dev' of github.com:owlbytes/HootsApp into dev
reset cancan abilities