Merge branch 'feature/bird1204'
Merge branch 'feature/bird1204'
別抓

這是之前未commit
layout

1310062306
layout131007
要合併 所以先commit
Merge branch 'layout'

Conflicts:
	XpendAll.xcodeproj/project.pbxproj

XpendAll.xcodeproj/project.xcworkspace/xcuserdata/case.xcuserdatad/UserI
nterfaceState.xcuserstate
	XpendAll/ViewController.m
	XpendAll/fullScreenMapViewController.m
	XpendAll/icon-googleplus.png
	XpendAll/icon.png
	XpendAll/maptitle.png
	XpendAll/otherpage2.jpg
	XpendAll/otherpage3.jpg
	XpendAll/plate.png
	XpendAll/shopDetailViewController.m
	XpendAll/shopViewController.xib
	XpendAll/shopWithKmlViewController.h
	XpendAll/shopWithKmlViewController.m
	XpendAll/shopWithKmlViewController.xib
	XpendAll/suspendViewController.m
加篩選
小改
Merge branch 'master' into feature/bird1204