Module templates modification
Modified Patients Module
Merge branch 'berhacker' into production-master