Merge branch 'berhacker'
Merge branch 'berhacker'
Modules modification
Modified patients module
Merge branch 'master' into production-master
Merge branch 'berhacker' into production-master