Branch test
Revert "Branch test"

This reverts commit e5334276a265722fda8b58cc20695ac2ef23b8a8.
Bump up skin version and xbmc.gui
Revert back to Confluence flags
Move update library/stop scanning to sidebar
Add now playing to sidebar