last commit for the night

need some sleep
Many new things work
Merge branch 'dev' into gh-pages