Add new notebook functionality
Merge branch 'master' of https://github.com/maeberli/travelnotebook

Conflicts:
	res/values/strings.xml
	src/ch/hearc/devmobile/travelnotebook/HomeActivity.java