huih
Merge branch 'master' of https://github.com/FelixA/meetInTheMiddle.git

Conflicts:
	src/com/example/meetinthemiddle/DisplayRegistrationActivity.java