resolve conflict 50_org.el
Modify cc-mode offset for 50_lang.el
Merge branch 'master' of https://github.com/hide-ikeno/dot.emacs.d

Conflicts:
	conf/40_vc.el
	conf/50_org.el
	conf/cocoa-emacs-config.el