Update command-parser.js
Update command-parser.js
Merge remote-tracking branch 'upstream/master'

Conflicts:
	command-parser.js

.
Update profilecommands.js
.
Merge remote-tracking branch 'upstream/master'
.