updated documentation for 2013, a bit
merged
Merge from branch 'ged-lab:master' to branch 'ged-lab:bleeding-edge'.