unused duplicate method
organised imports
Merge branch 'fix'
Update Android Support Library