Fixed universal permissions handling
Added merge tests
Merge branch 'master' of github.com:SierraSoftworks/GuardHouse