Issue #69: Added ColdFront conference
Merge branch 'master' into ISSUE-69-coldfront-conf

Conflicts:
	data/conferences.json
Merge pull request #70 from krisbulman/ISSUE-69-coldfront-conf

Issue #69: Added ColdFront conference