merged back changes from trunk

git-svn-id: svn://svn.openvpms.org/openvpms/release/branches/1.8-dev@5878 9e4fa352-aafb-0310-9071-df624684024b
Refactored JDBC property definitions to better support multiple development trees. 
The openvpms database is no longer required to perform a release build
. removed hibernate.properties for test purposes. JDBC properties are now supplied  via system properties, and picked up in the spring context
. defined a release profile used to specify the database when performing releases

git-svn-id: svn://svn.openvpms.org/openvpms/release/branches/1.8-dev@5884 9e4fa352-aafb-0310-9071-df624684024b
Changes for OVPMS-1458 Location-specific product pricing

git-svn-id: svn://svn.openvpms.org/openvpms/release/branches/1.8-dev@5899 9e4fa352-aafb-0310-9071-df624684024b
change to suppress company name if its empty in invoice a4.jrxml

git-svn-id: svn://svn.openvpms.org/openvpms/release/trunk@5908 9e4fa352-aafb-0310-9071-df624684024b
merged back changes from trunk

git-svn-id: svn://svn.openvpms.org/openvpms/release/branches/1.8-dev@5912 9e4fa352-aafb-0310-9071-df624684024b
Merge branch '1.8-Dev'

Conflicts:
	src/conf/spring/applicationContext.xml