kleine aanpassingen
Merge branch 'master' of https://github.com/SMPT-Groep3/Smart-Mobile

Conflicts:
	PApple2/gen/com/example/papple2/R.java
	PApple2/res/layout/activity_load_project.xml