collect note
Merge branch 'master' of git@github.com:StevenKo/travel.git

Conflicts:
	src/com/travel/story/ArticleActivity.java