Merge origin/master

Conflicts:
	pom.xml
	src/main/assembly/felix.xml
	src/main/java/org/dyndns/soundi/jamendoplugin/Activator.java
	src/main/java/org/dyndns/soundi/jamendoplugin/ConfigurationFrame.java
	src/main/java/org/dyndns/soundi/jamendoplugin/JamendoPlugin.java
	src/main/java/org/dyndns/soundi/jamendoplugin/JamendoSong.java
	src/main/java/org/dyndns/soundi/jamendoplugin/PluginInformationFrame.java
Merge origin/master

Conflicts:
	pom.xml
	src/main/assembly/felix.xml
	src/main/java/org/dyndns/soundi/jamendoplugin/Activator.java
	src/main/java/org/dyndns/soundi/jamendoplugin/ConfigurationFrame.java
	src/main/java/org/dyndns/soundi/jamendoplugin/JamendoPlugin.java
	src/main/java/org/dyndns/soundi/jamendoplugin/JamendoSong.java
	src/main/java/org/dyndns/soundi/jamendoplugin/PluginInformationFrame.java
Merge origin/master

Conflicts:
	pom.xml
	src/main/assembly/felix.xml
	src/main/java/org/dyndns/soundi/jamendoplugin/Activator.java
	src/main/java/org/dyndns/soundi/jamendoplugin/ConfigurationFrame.java
	src/main/java/org/dyndns/soundi/jamendoplugin/JamendoPlugin.java
	src/main/java/org/dyndns/soundi/jamendoplugin/JamendoSong.java
	src/main/java/org/dyndns/soundi/jamendoplugin/PluginInformationFrame.java
blah