push 21
Merge branch 'master' of github.com:Isht/apotek

Conflicts:
	app/controllers/data.php
	assets/js/app/controller/pelayanan/LyPmr.js
	assets/js/app/model/PmrBagDalamModel.js
	assets/js/app/view/pelayanan/lypmr/DataPribadiPmr.js
	assets/js/app/view/pelayanan/lypmr/EfekObatPmr.js
	assets/js/app/view/pelayanan/lypmr/PmrBagianDalam.js
	assets/js/app/view/pelayanan/lypmr/RiwayatAlergiPmr.js
	assets/js/app/view/pelayanan/lypmr/RiwayatPenyakitPmr.js