dev-map
dev-map
dev-map
dev
dev-修复baiduMap造成的方格字问题
dev
dev-map
Merge remote-tracking branch 'origin/master'

Conflicts:
	Clockin/gen/com/brevy/clockin/R.java
	Clockin/res/layout/activity_clockin_location.xml
	Clockin/src/com/brevy/clockin/listener/ClockinLocationListeners.java
	Clockin/src/com/brevy/clockin/ui/ClockinLocationActivity.java
	Clockin/src/com/brevy/clockin/ui/ClockinTimeIntervalActivity.java