General Settings Edit & Delete
Merge remote-tracking branch 'origin/master'

Conflicts:
	freightbit/src/main/webapp/core/settings/generalSettings.jsp
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 6bfdcc026742b610f8580db457b3a68b14edf6ef.
Merge branch 'master' of https://github.com/johnpelquingua/freightbit-logistics

Conflicts:

	freightbit/src/main/java/com/sr/apps/freightbit/operations/action/OperationsAction.java

	freightbit/src/main/webapp/operations/inland_freight/inlandFreightPlanningInfo.jsp

	freightbit/src/main/webapp/operations/inland_freight/inlandFreightPlanningOrigin.jsp