Merge remote-tracking branch 'origin/dev' into lang
Merge remote-tracking branch 'origin/dev' into lang
Removed double class
added waypoint class + new fragment
Merge remote-tracking branch 'origin/route' into lang
forgot Manifest
merging
Bad fishhooks!
Adding SQL db to the app
Really adding to the database
#6 Added testdata to baseActivity + added google maps functionality