Herinnering Update
Merge branch 'master' of https://github.com/johansergeyssels/ProjectMobile

Conflicts:
	ProjectMobile/ProjectMobile/Storyboard.storyboard
Merge branch 'master' of https://github.com/johansergeyssels/ProjectMobile