sql stuff
Merge branch 'master' of https://github.com/emeraldjava/bhaawp.git

Conflicts:
	sql/scripts/dcm2013.sql
	sql/scripts/dublinhalf2013custom.sql