Fix for DB build
Upload Module intergration
Merge https://github.com/jarradm/PAWA into UploadImageNew
Merge branch 'UploadImageNew' of https://github.com/jarradm/PAWA into UploadImageNew