Updated Storyboard
Merge remote-tracking branch 'origin/master' into Miemie
Storyboard 2.0, modified the View of shake page; added Views of Map and Filter.
Merge branch 'Miemie'

Conflicts:
	SmartRecomm/RestaurantList.plist
	SmartRecomm/SmartRecomm.storyboard