Pull from wiseone
Merge branch 'master' of github.com:KevinMarete/UPID
Pull from marete
Added patrick's admin module
Patrick's module
Merge branch 'master' of https://github.com/JohnAdamsy/UPID
merged with adams