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

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

Conflicts:
	AndroidManifest.xml
Filter2
Merge remote-tracking branch 'origin/master'