Merge branch 'localplay-vlc' into all
Merge branch 'localplay-xbmc' into all

Conflicts:
	README.md
Merge branch 'nopopup' into all
Merge branch 'api-subsonic' into all
Merge branch 'now-playing' into all

Conflicts:
	lib/class/update.class.php
	lib/preferences.php
Merge branch 'browse' into all

Conflicts:
	lib/class/update.class.php