PublicHeaderTest

- Not sure if it works I will test it once my phone charged up a little
bit
Merge branch 'master' of https://github.com/glukas/Social

Conflicts:
	Social/src/ch/ethz/inf/vs/android/glukas/project4/database/Friends.java