fix
Merge branch 'master' of https://github.com/mathlambrecht/cp3-eindopdracht-groep04
fix
Merge branch 'master' of https://github.com/mathlambrecht/cp3-eindopdracht-groep04

Conflicts:
	Main-app.xml
navigator
Merge branch 'master' of https://github.com/mathlambrecht/cp3-eindopdracht-groep04

Conflicts:
	src/Main.as
	src/be/devine/cp3/billsplit/Application.as
	src/be/devine/cp3/billsplit/service/JSONService.as