Changed interface, added retina icons
Merge branch 'refs/heads/master' into RetinaBranch