More changes on the way.
Merge branch 'master' of https://github.com/vbledar/cigwatcher

Merge completed.

Conflicts:
	grails-app/views/report/campaignReportingIntervals.gsp