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

Conflicts:
	res/layout/filter.xml
Filteract
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	src/be/phl/WedstrijdHackaton/fragments/StagesFragment.java
Merge branch 'master' of https://github.com/kRSB-/WedstrijdHackaton

Conflicts:
	res/layout/filter.xml
Filteract
Merge branch 'master' of https://github.com/kRSB-/WedstrijdHackaton