Fix #667
merged master
merged master
put change in the right place
Merge branch 'master' of github.com:getnikola/nikola into gallery-unsort
Merge pull request #700 from getnikola/gallery-unsort

Add GALLERY_SORT_BY_DATE option (Issue #667)