Merged master
Merge commit '8c359f1b042bb05bef1bab0caea0c8891d687472' into actionbar

* commit '8c359f1b042bb05bef1bab0caea0c8891d687472':
  Merged master

Conflicts:
	res/values-nl/strings.xml
	src/uk/org/ngo/squeezer/itemlists/SqueezerPluginItemView.java