dd
add new
add
modify comm
add
Merge remote-tracking branch 'origin/20140821'

Conflicts:
	new