add intro to list view
Merge branch 'master' of git@github.com:StevenKo/travel.git

Conflicts:
	res/layout/layout_intro_category.xml