Merge branch 'features' of github.com:owlbytes/HootsApp into features
Merge branch 'features'