Bram's commig
Merge branch 'master' of https://github.com/mijnvivo/iOS

Conflicts:
	VIVO/VIVO/Base.lproj/Main_iPhone.storyboard

Confict-solved by MergeMaster Ferdi