remove conflict ecb for 24.3
clean customize stuff
cl-lib unnecessary for 24.3
key for org-resolve-clocks
resolve gnutls warning when sending mail
Merge branch master(ubuntu)