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

Conflicts:
	Canvas/gen/edu/ubbcluj/canvasAndroid/R.java
	Canvas/src/edu/ubbcluj/canvasAndroid/DashBoardActivity.java