Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer