php
Merge branch 'master' of https://github.com/mijnvivo/iOS

Conflicts:
	VIVO/VIVO/OntdekkenViewController.m