Support for tag settings dialogs and wallpaper.
Merge branch 'master' of github.com:jamesread/wacky-tracky

Conflicts:
	api/server.py
	main.js