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

Conflicts:
	src/com/kosbrother/fragments/CategorySiteFragment.java
clear