begun tester methods
Merge branch 'master' of https://github.com/glukas/Social

Conflicts:
	Social/src/ch/ethz/inf/vs/android/glukas/project4/database/DatabaseManager.java
barely finished with db changes and static id fix
static id fix
Merge branch 'master' of https://github.com/glukas/Social

Conflicts:
	Social/src/ch/ethz/inf/vs/android/glukas/project4/MainActivity.java
	Social/src/ch/ethz/inf/vs/android/glukas/project4/database/DatabaseManager.java
	Social/src/ch/ethz/inf/vs/android/glukas/project4/database/Friends.java
	Social/src/ch/ethz/inf/vs/android/glukas/project4/database/Posts.java
	Social/src/ch/ethz/inf/vs/android/glukas/project4/database/Utility.java
	Social/src/ch/ethz/inf/vs/android/glukas/project4/test/DatabaseTest.java
temporary changes
Merge remote-tracking branch 'origin/master'