Removed not needed code in welcome page test
Upgrade to Grails 2.2.5
Merge branch 'develop' into feature/grails_wip
An error occurd on second startup in production env, primary key constraint violation on UserSecRoleSec: Fixed. Also fixed problem with JSON-parsing in RInfoService
Changed logging to warn
Merge branch 'develop' into feature/grails_wip
Merge branch 'hotfix/BETA3_HOT01'
Merge branch 'develop' into feature/grails_wip
Merge branch 'master' into feature/grails_wip
Upgrade to 2.3.10, not complete, 2 failing tests remain
Fixed datepicker bug in grails 2.3.10, #164
Fixed JSON Serialization bug in upgrade of grails to 2.3.10
Grails upgrade 2.4.1
Merge branch 'develop' into feature/156

Conflicts:
	test/regression/recorded/admin/welcome_screen.js
Ignored all test log files
Fixed bug in admin view related to depricated method (live) in jQuery plugin 1.11.1
Grails upgrade 2.4.1
Upgrade to 2.4.3
Merge branch 'feature/165' of github.com:rinfo/lagrummet.se into feature/165

Conflicts:
	application.properties
Merge branch 'develop' into feature/grails_wip