Some updates
new sprites
Merge branch 'master' into develop

Conflicts:
	images/sprites-retina/mail.png
	images/sprites/mail.png