Merge pull request #17 from mizmay/session-3

Session 3
Merge pull request #18 from mizmay/session-3

Session 3
Fixed link to presentation
remove reference to cartographic talk next time
Fix image
Deleted redundant part (no more about mashups)
Fixed image of text editor
Fixed another image
Clean up
Pull in Stephanie changes