Merge branch 'master' into milestones/2.0.0
Merge branch 'master' into milestones/2.0.0
Fixed typo
Merge pull request #916 from komola/bug/fix-typo

Fixed typo in exception
Merge branch 'master' into milestones/2.0.0
fixed scoping of validation
Merge branch 'master' into milestones/2.0.0
Merge branch 'master' into milestones/2.0.0
Merge branch 'master' into milestones/2.0.0
merge
Merge branch 'master' into milestones/2.0.0
Merge branch 'master' into milestones/2.0.0

Conflicts:
	lib/dao-factory.js
	lib/dao-validator.js
	lib/dao.js
	lib/emitters/custom-event-emitter.js
change column postgresql defaul, spacing bug
Merge pull request #967 from feroc1ty/milestones/2.0.0

change column postgresql defaul, spacing bug
Merge branch 'master' into milestones/2.0.0

Conflicts:
	lib/emitters/custom-event-emitter.js
Merge branch 'master' into milestones/2.0.0
Merge branch 'master' into milestones/2.0.0
Merge branch 'master' into milestones/2.0.0
Merge branch 'master' into milestones/2.0.0
Merge branch 'master' into milestones/2.0.0