made Machine IP Configurable.
Merge branch 'master' of https://github.com/rohandani/MRM-PUB2.0

Conflicts:

delivery/src/main/webapp/WEB-INF/pages/mrm/graphics/screens/home/scripts
/alienscripts/js/contentFlow/ContentFlowAddOn_CSFlow.js

delivery/src/main/webapp/WEB-INF/pages/mrm/graphics/tacks/PublicationDet
ails.json

delivery/src/main/webapp/WEB-INF/pages/pub/graphics/tacks/PublicationDet
ails.json