Miscellaneous changes to allow prescribing combination medicines and text entry of quantity as required by some pharmacies

Revision of original commit to revert changes made to Quantity data type
Merge branch 'master' of https://github.com/fr4nkie/openemr

Conflicts:
	sql/4_1_2-to-4_1_3_upgrade.sql