Adding new drugs to database and editing drug information UI
functionality
Merge branch 'master' of https://github.com/liisj/CHP.git

Conflicts:
	PortletTest-portlet/docroot/WEB-INF/src/com/test/NewPortlet2.java