re-arrange imports to quiet Eclipse warnings
Merge branch 'master' of ssh://home.caboteria.org/home/tobyc/work/mitre/pdmp/openmrs-module-pdmp

Conflicts:
	omod/src/main/java/org/openmrs/module/pdmp_query/web/controller/PDMPPageController.java
	omod/src/main/java/org/openmrs/module/pdmp_query/web/controller/PDMPQueryManageController.java
small changes to quiet eclipse warnings
trivial reformatting to make eclipse happy
combine api/ and omod/ into a single sub-project

We weren't publishing the API as a separate resource so the extra
project wasn't worth the complexity.
trim some redundancy from the pom.xml files
add a file containing the license