test

test
Revert "test"

This reverts commit 250ae135efc996f7e66aa95f74aaf323b0a80e76.
revert test
Start weekmenu

begin
tussensync
sync
Dagen opgehaald

ophalen dagen(voorlopig zonder klasse)
Dagen + data (zonder klasse)
Integratie klasse + meerde campussen
Scrollable

voorlopige (test)layout scrollable
commit

commit
Merge remote-tracking branch 'origin/Carl'

Conflicts:
	AndroidManifest.xml
	gen/com/mobsoft/pxlapp/R.java
	res/values/strings.xml
	src/com/mobsoft/pxlapp/Lesrooster.java
	src/com/mobsoft/pxlapp/util/SimpleDateTime.java

	modified:   AndroidManifest.xml
	modified:   gen/com/mobsoft/pxlapp/R.java
	modified:   res/layout/activity_main.xml
	deleted:    res/layout/activity_menu.xml
	new file:   res/layout/activity_weekmenu.xml
	new file:   res/menu/weekmenu.xml
	modified:   res/values/strings.xml
	new file:   src/com/mobsoft/pxlapp/Dagmenu.java
	modified:   src/com/mobsoft/pxlapp/Les.java
	modified:   src/com/mobsoft/pxlapp/Lesrooster.java
	modified:   src/com/mobsoft/pxlapp/LesroostersActivity.java
	modified:   src/com/mobsoft/pxlapp/MainActivity.java
	deleted:    src/com/mobsoft/pxlapp/MenuActivity.java
	new file:   src/com/mobsoft/pxlapp/Weekmenu.java
	new file:   src/com/mobsoft/pxlapp/WeekmenuActivity.java
	modified:   src/com/mobsoft/pxlapp/util/SimpleDateTime.java