Advanced in the map fragment, drawing the routes will not be as easy as we thought...
Merge remote-tracking branch 'original/master'
Merge pull request #39 from exside/master

Advanced in the map fragment, drawing the routes will not be as easy as we thought
Mensa Detail view finally has a view pager
Merge pull request #40 from exside/master

Mensa Detail view finally has a view pager (import library, it won't work without!)
heavy work in progress of local database
fixed merge conflict