xxxx
Merge branch 'rramirez_20131202_loginOwnUser' of https://github.com/INNovatieSAS/QR_localizationApp_IOS into rramirez_20131202_loginOwnUser

Conflicts:
	QR_localizationApp_IOS.xcodeproj/project.xcworkspace/xcuserdata/ronaldramirez.xcuserdatad/UserInterfaceState.xcuserstate
xxxx