Merge clipboard modification

Merge clipboard and resolve conflict
Get out of the Wait Message while

Get out of the Wait Message while when the status is 0
Replace space by tab
Merge branch 'MergeClipboard'