rename
Merge remote-tracking branch 'origin/branch_first_domain'

Conflicts:
	TestProject/grails-app/domain/testproject/FewStrings.groovy
controllers
Merge branch 'master' of https://github.com/michal3/gitFirstStep.git

Conflicts:
	TestProject/grails-app/domain/testproject/FewStrings.groovy
s