Permission changes
Merge branch 'master' of https://github.com/joemckie/horizon-framework