code cleanup + bug fixes
Merge branch 'master' of https://github.com/argaman-aloni/StudyBuddy

Conflicts:
	src/com/technion/studybuddy/MainActivity.java
	src/com/technion/studybuddy/MainFragment.java
bla?