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
deleted lots of commented out code
fixing recipients
fixed create new user added product recipients
some minor changes
Merge branch 'master' of github.com:xxSandiLLyxx/perishably2
Merge branch 'master' of github.com:xxSandiLLyxx/perishably2
Merge branch 'master' of github.com:xxSandiLLyxx/perishably2
deleted lots of commented out code
merge conflict in uap controller
fixed create new user added product recipients
some minor changes