removed wysiwyg
resolved conflicts
Merge branch 'master' of https://github.com/irenemrisho/UDIHIS
added admit patient functionality
Merge branch 'master' of https://github.com/irenemrisho/UDIHIS