Registation changes
Register changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	ChitChat/ChitChat.v12.suo
Merge remote-tracking branch 'origin/master'

Conflicts:
	ChitChat/ChitChat.v12.suo