Merge branch 'GUI-v2' into GUI-v3

Conflicts:
	grails-app/conf/Config.groovy
	grails-app/controllers/timurapp/UserController.groovy
	grails-app/domain/timurapp/Job.groovy
	grails-app/domain/timurapp/User.groovy