Dropbox folder
Merge branch 'dev' of https://github.com/qinjian623/emacs-config into dev

Conflicts:
	elpa/org-20130701/ox-html.elc
	init.el