-Updated for BIMServer 1.3 and various refactoring and bug fixing
Merge remote-tracking branch 'origin/master'

Conflicts:
	COBieShared/src/org/erdc/cobie/shared/PluginUtilities.java
	COBieToolkit/.classpath