Merge branch 'master' of https://github.com/joincamp/xbmc-library-service
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	resources/jdbc.properties