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

Conflicts:
	app/res/layout/about_fragment.xml
	app/res/layout/applist_by_show_fragment.xml
	app/res/values/strings_about.xml
start of work on data source processing
Fixed merge conflict and added missing items because of incorrect
reference to ABS

Merge branch 'ActionDrawer' of github.com:hyperspc/AndroidAppAddicts
into hyperspc-ActionDrawer

Conflicts:
	app/res/layout/applist_by_category_fragment.xml
	app/res/layout/applist_by_show_fragment.xml
	app/res/layout/hosts_fragment.xml
	app/src/main/java/com/sage42/androidappaddicts/app/settings/SettingsFragment.java
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
added missing file (from ABS)
Merge pull request #27 from corsc/master

added missing file (from ABS)
fix license headers
format the xmls (again)
fixed obvious lint errors
fixes to get it to build
Merge pull request #28 from corsc/cleanup

Please review this and ask if don't know what I made these changes
refactoring host fragment