Revert "org-agenda.el (org-agenda-insert-diary-make-new-entry): Fix ordering"

This reverts commit 5512bedee6d48a0a2bc4250cc945d404ee94d159.
Merge branch 'master' of orgmode.org:org-mode
Merge branch 'master' of orgmode.org:org-mode
Merge branch 'master' of orgmode.org:org-mode
Merge branch 'master' of orgmode.org:org-mode
Merge branch 'master' of orgmode.org:org-mode
Merge branch 'master' of orgmode.org:org-mode
Merge branch 'master' of orgmode.org:org-mode
Merge branch 'master' of orgmode.org:org-mode
ox-icalendar: Small fix

* lisp/ox-icalendar.el (org-icalendar-export-current-agenda): Add
  missing properties.  Also fix typo for body-only argument.
org-babel-eval: compilation-mode to deal with errors in (C/C++/D)
ob-C: fix missing function org-babel-expand-body:cpp
Merge branch 'master' of orgmode.org:org-mode
ox-beamer: Use \columnwidth instead of \textwidth for columns

* lisp/ox-beamer.el (org-beamer--format-block): Use columnwidth
  instead of textwidth.

Thanks to Julien Cubizolles for suggesting it.
http://permalink.gmane.org/gmane.emacs.orgmode/90246
org-table: Add ascii plotting in tables

* org-table.el (orgtbl-ascii-plot): Top-level function.
(orgtbl-ascii-draw), (orgtbl-uc-draw-grid), (orgtbl-uc-draw-cont):
Functions which go in table formulas for drawing bars.
* org.el: key binding and menu binding

Thanks to Michael Brand and Nicolas Goaziou for feedback and
enhancements.
Merge branch 'master' of orgmode.org:org-mode
org-element: Make properties parsing more robust

* lisp/org-element.el (org-element-property-drawer-parser,
  org-element-node-property-parser): Ignore lines that are not node
  properties.
(org-element-node-property-interpreter): Allow nil properties.

* lisp/org.el (org-re-property): Fix regexp to match properties with
  empty values.

* testing/lisp/test-org-element.el (test-org-element/node-property):
  Add tests.

Thanks to Eike for reporting it.
http://permalink.gmane.org/gmane.emacs.orgmode/90293
Merge branch 'maint'

Conflicts:
	lisp/org-element.el
Fix failing tests

* lisp/org.el (org--align-node-property): Properly align properties
  with empty values.
org-license.el: Upgrade to Creative Commons 4.0

* contrib/lisp/org-license.el: Change url and text in international license.