Merge branch 'tmp' into local20140820

Conflicts:
	new
add