added classpath and project file to master
added classpath and project file
Merge branch 'master' of github.com:HackerspaceBremen/hshb_notifier_android
updated readme
updated readme
Merge branch 'master' of github.com:HackerspaceBremen/hshb_notifier_android

Conflicts:
	README.md
made small changes to fit the new backend
Merge branch 'master' of github.com:HackerspaceBremen/hshb_notifier_android
Merge remote-tracking branch 'remotes/origin/dev'

Conflicts:
	project.properties
	res/values-de/strings.xml
	res/values/strings.xml
	src/de/hackerspacebremen/fragments/ChangeStatusFragment.java
finished version 1.2
Merge pull request #14 from HackerspaceBremen/master

version 1.2