Fixed Mac OS X Icon Bug.
Mac Spacing Bug Fixed.
Fixed Conflict.
Merge branch 'master' of https://github.com/Kreogist/Cuties