Fix screenshots
Fix merge conflict
Merge branch 'master' of http://github.com/stianwe/USNeuroNav