updated sample to fix missing entries
Fixed spelling mistakes
undo commit from 2.0 merge

Was made on error
Update 1.2.md

Undo 2.0 merge error
updated schema
updated to address comments
Merge branch 'master' of github.com:fehguy/swagger-spec

Conflicts:
	fixtures/v2.0/json/resources/securityExample.json