Finally solved navbar problem
Merge branch 'dev' of https://github.com/rickardz/SchemeApp into dev

Conflicts:
	SchemeApp/SchemeApp.xcodeproj/project.pbxproj
	SchemeApp/SchemeApp.xcworkspace/xcshareddata/SchemeApp.xccheckout