MOD-146 add references for bean properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/META-INF/spring/googleAnalytics.xml