Revert:
Merge remote-tracking branch 'origin/master'

Conflicts:
	locon-grailsPlugins.iml
itogi