Fancy Scrolling, added assets, support for 4 inch screens
Merge remote-tracking branch 'origin/Connor' into Tristan2

Conflicts:
	IviesCompanionApp/IviesCompanionApp/ModalViewController.xib
	IviesCompanionApp/IviesCompanionApp/initialDrinkingViewController.m