Merge pull request #212 from tomvantilburg/master

merge from Tom
Merge pull request #20 from Geodan/master

pull request 20140326
#194 buttons for changing between text and/or map at top
Merge pull request #215 from MartijnHeuff/master

#194 buttons for changing between text and/or map at top
Merge pull request #50 from Geodan/master

merge from origin