Merge branch 'develop' into picasso

# Conflicts:
#	Squeezer/src/main/java/uk/org/ngo/squeezer/framework/ItemListActivity.java
Merge branch 'develop' into picasso

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'picasso' of https://github.com/nikclayton/android-squeezer into picasso

# Conflicts:
#	NEWS
#	Squeezer/build.gradle
#	Squeezer/src/main/java/uk/org/ngo/squeezer/SearchActivity.java
#	Squeezer/src/main/java/uk/org/ngo/squeezer/framework/BaseListActivity.java
#	Squeezer/src/main/java/uk/org/ngo/squeezer/framework/ItemListActivity.java
#	Squeezer/src/main/java/uk/org/ngo/squeezer/itemlist/PlayerListActivity.java
#	Squeezer/src/main/java/uk/org/ngo/squeezer/itemlist/PlayerListAdapter.java
#	Squeezer/src/main/java/uk/org/ngo/squeezer/model/Player.java
#	Squeezer/src/main/res/xml/changelog_master.xml