Friendrequest/response via NFC

- MainActivity(will be in another Activity later I think) has a button
right now which starts a NFC FriendRequest
- will wait in an endless while loop like until a reponse is received
- Added
Merge remote-tracking branch 'origin/master'

Conflicts:
	Social/gen/ch/ethz/inf/vs/android/glukas/project4/R.java
	Social/src/ch/ethz/inf/vs/android/glukas/project4/MainActivity.java