Cookiek karbantartasa Saved Preferences segitsegevel
Conflictok megoldva

Merge branch 'master' of https://github.com/szaza/canvas-android

Conflicts:
	Canvas/src/edu/ubbcluj/canvasAndroid/backend/repository/restApi/RestUserDAO.java