Fixed Issue#274-279, Added more fields in Create EIR Form under Container Management required for Pentaho EIR Form, and Changed Shipping and Trucking into Drop down values displaying all Vendor Names with their respective vendor types.
Merge branch 'master' of https://github.com/johnpelquingua/freightbit-logistics

Conflicts:
	freightbit-lib/src/main/java/com/sr/biz/freightbit/operations/dao/ContainerDao.java