Fixed a display bug on retina devices
Merge branch 'Develop'