Can now clear the radio buttons by clicking on the selected one(and thus sort by only picture), re-selecting user location does not clear the buttons yet for some reason.
Cleaned up warnings.
Merge branch 'master' into steven