relic
new relic
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/artifacts/skgaServer_war_exploded.xml
 new relic - app name changed