Add basic navigation between activities
Add missing fils
Merge branch 'master' of https://github.com/maeberli/travelnotebook

Conflicts:
	AndroidManifest.xml