placeholders aangepast
Merge branch 'master' of https://github.com/MaicoDhaenens/joetz

Conflicts:
	joetz_ios/Joetz/Base.lproj/Main.storyboard