afd
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/tomdoesburg/kooktijden/vegetables/VegetableActivity.java
	app/src/main/res/layout/activity_vegetable_twopane.xml
Merge branch 'master' of https://github.com/TomDoes/Kooktijden
Refactoren! #32