NEW: added slides to url and navigation
Merge branch 'master' into slides
NEW: added slides urls and views. not working yet, though.