Commit
B
Merge branch 'master' of https://github.com/szaza/canvas-android
Asszem megoldódott a konkurencia probléma

Conflicts:
	Canvas/res/menu/default_menu.xml
	Canvas/src/edu/ubbcluj/canvasAndroid/BaseActivity.java
	Canvas/src/edu/ubbcluj/canvasAndroid/backend/util/PersistentCookieStore.java