changes to uap controller
merge conflicts reconciled
Merge branch 'master' of github.com:xxSandiLLyxx/perishably2
merge conflicts resolved
Merge branch 'master' of github.com:xxSandiLLyxx/perishably2
Merge branch 'master' of github.com:xxSandiLLyxx/perishably2
Merge branch 'master' of github.com:xxSandiLLyxx/perishably2
Merge branch 'master' of github.com:xxSandiLLyxx/perishably2
Merge branch 'master' of github.com:xxSandiLLyxx/perishably2