merged android into master
added preferences
Merged Android into master
Added settings page, fragments for incomplete functionality. Cancels findShows task on activity pause