First steps towards creating top bar.
Merge branch 'master' of https://github.com/FutureStop/where-to-stop into ss-top-bar

Conflicts:
	FutureStop.xcodeproj/project.pbxproj
	FutureStop/FSAppDelegate.m
	FutureStop/en.lproj/FSViewController_iPad.xib
Top bar mostly implemented.
Merge branch 'master' of https://github.com/FutureStop/where-to-stop into ss-top-bar

Conflicts:
	FutureStop.xcodeproj/project.pbxproj
	FutureStop/Screens/FSLeftScreenViewController.m
fixed timer
Fixing frames
Merge branch 'master' into videos
Fixing frames