add cocoapods and style main view
updated
Merge branch 'master' into mario-mapview

Conflicts:
	WellDoneiOS/PumpDetailViewController.m
Merge branch 'mario-mapview'