Merge branch 'master' of https://github.com/kRSB-/WedstrijdHackaton

Conflicts:
	AndroidManifest.xml
Filter lay-out fail
Merge branch 'master' of https://github.com/kRSB-/WedstrijdHackaton

Conflicts:
	res/layout/filter.xml
Filteract