resetting file
Merge branch 'development'

Conflicts:
	apidocs/ColdDoc.cfc