Implemented JC-1486
Updated JC-1486
Merge branch 'JC-1486'

Conflicts:
	jcommune-view/jcommune-web-view/src/main/resources/org/jtalks/jcommune/model/datasource.properties