Xib Small Changes
Merge branch 'master' of https://github.com/inaka/fyp-ios

Conflicts:
	FYP.xcodeproj/project.pbxproj
	FYP/FYPHomeViewController.m