Icon Update

Signed-off-by: Sarah <sar@sw33t.com>
Merge branch 'retina' of github.com:cyberchimps/core into retina

Signed-off-by: Sarah <sar@sw33t.com>

Conflicts:
	options/options-init.php