updated error codes
fixed duplicate
fixed typo
fixed names
Merge remote-tracking branch 'origin/issue317' into 1.1

Conflicts:
	js/common/bootstrap/modules.js