Merge branch 'master' of https://github.com/jennift/AndroidAppAddicts
into mergingbranch

Conflicts:
	app/res/layout/about_fragment.xml
	app/res/layout/applist_by_category_fragment.xml
	app/res/layout/applist_by_show_fragment.xml
	app/res/layout/hosts_fragment.xml
	app/res/values/strings_about.xml
Merge branch 'mergingbranch' of github.com:hyperspc/AndroidAppAddicts
into hyperspc-mergingbranch

Conflicts:
	app/res/layout/applist_by_category_fragment.xml
	app/res/layout/applist_by_show_fragment.xml
	app/res/layout/hosts_fragment.xml