Updated Tomcat run config

Added GRIDGAIN_HOME to tomcat run config
Merge remote-tracking branch 'origin/master'