1
Merge branch 'master' of https://github.com/ravenholm/sql-scripts

Conflicts:
	otrs_agents/agents_activity_by_2_hour_timeslots.sql
	otrs_hd/hd_main_new.sql