Progress View
Merge branch 'master' of https://github.com/vjyanand/smarttrip

Conflicts:
	SmartTrip/TripViewController.m
state