Search begin en herindeling structuur
Merge branch 'master' of https://github.com/MartijnSmit/iKnow

Conflicts:
	iKnow.xcodeproj/project.pbxproj
	iKnow/en.lproj/MainStoryboard.storyboard
comit