Merge pull request #35 from jbonicioli/master

Main menu node list sort by node ID that did not survive the facelift merge

Sorry, it was mega merge, it took me over 2 hours and I was trying to carefully don't miss anything. Well I missed it :S Next time branches will be smaller.
Merge remote-tracking branch 'upstream/master'