rankingssysteem voortgang

login scherm werkt niet dus ik kan m niet testen (wss verkeerde versie)
Merge branch 'master' of https://github.com/Firefoxiii/DPBsoft
 fuck mergeconflicts

Conflicts:
	app/bin/app.apk
	app/bin/classes.dex
	app/bin/classes/com/dpbsoft/app/NieuwsOverzichtActivity$1.class
	app/bin/classes/com/dpbsoft/app/NieuwsOverzichtActivity$2$1.class
	app/bin/classes/com/dpbsoft/app/NieuwsOverzichtActivity$2.class
	app/bin/classes/com/dpbsoft/app/NieuwsOverzichtActivity$CustomComparator.class
	app/bin/classes/com/dpbsoft/app/NieuwsOverzichtActivity$CustomIntComparator.class
	app/bin/classes/com/dpbsoft/app/NieuwsOverzichtActivity.class
	app/bin/resources.ap_
	app/src/com/dpbsoft/app/NieuwsOverzichtActivity.java
	facebook-android-sdk-3.0.1/facebook/bin/facebooksdk.jar