Merge branch 'develop' of github.com:MMS-Projects/copyit-app into develop