Merge commit 'a0548c' into HEAD

Conflicts:
	RiskAnalyticsCoreGrailsPlugin.groovy
fix no session error