user functions tested
Merge branch 'master' of https://github.com/glukas/Social

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