Made branch for the demo
Merge
Merge branch 'Mathijs' into deel-demo

Conflicts:
	Bestuur App/.classpath
	Bestuur App/src/com/example/idpproject/MainActivity.java
connectionLed active
settings deleted and statistics updated
astah dingie =D
Updated colors and disabled server
Merge branch 'deel-demo' of https://github.com/Stormram/iDP-app into Mathijs

# By Eddie Sprietsma (3) and Mathijs Jonker (1)
# Via Eddie Sprietsma
* 'deel-demo' of https://github.com/Stormram/iDP-app:
  settings deleted and statistics updated
  connectionLed active
  Merge
  Made branch for the demo

Conflicts:
	Bestuur App/src/com/example/idpproject/ChangeDashboard.java
	Bestuur App/src/com/example/idpproject/MainActivity.java