adding retina images and bug fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/images/aakash_icons/iphone-flag-hoverbutton.png
	public/images/aakash_icons/iphone-light-button.png
	public/images/aakash_icons/iphone-return-button.png