stuff
Merge branch 'develop' of https://github.com/hoffmannjoern/bottlemail_android into develop

Conflicts:
	v2/res/values/strings.xml
	v2/src/uni/leipzig/bm2/activities/MainActivity.java
e enter the commit message for your changes. Lines starting