more changes to make the project compile...
Merge branch 'master' of https://github.com/argaman-aloni/StudyBuddy

Conflicts:
	project.properties
res is compiled :D
Merge branch 'master' of https://github.com/argaman-aloni/StudyBuddy
removed many of the compilation errors.
some errors left du to code dependencies which I don't understand.
all in all, there are less errors than before.