show current week
Merge branch 'master' of github.com:mathiasose/fellesprosjekt

Conflicts:
	java_app/src/app/App.java
	java_app/src/app/CalendarView.java