update gitignore
update
Merge branch 'develop' of /Users/wd/git/yang/weibo into develop

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	fabfile.py
'haha'
'haha'
'haha'
'haha'
'haha'
'haha'
add poi_users, nearby_timeline
update
'haha'
Merge branch 'develop' of file:////192.168.1.64/git/weibo into develop
'haha'
'haha'
'haha'
'haha'
'haha'
'haha'
'haha'