.gitignore is now working
xml import controller updates
Merge branch 'dev' of github.com:VizioArt/dock into dev