horoscope updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/png/264D.png
	assets/svg/2648.svg
	assets/svg/2649.svg
	assets/svg/264B.svg
	assets/svg/264C.svg
	assets/svg/264D.svg
	assets/svg/264F.svg
	assets/svg/2650.svg
	assets/svg/2651.svg
	assets/svg/2653.svg
bug fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/png/2648.png
	assets/png/2649.png
	assets/png/264B.png
	assets/png/264C.png
	assets/png/264D.png
	assets/png/264F.png
	assets/png/2650.png
	assets/png/2651.png
	assets/png/2653.png
	assets/svg/2648.svg
	assets/svg/2649.svg
	assets/svg/264B.svg
	assets/svg/264C.svg
	assets/svg/264D.svg
	assets/svg/264F.svg
	assets/svg/2650.svg
	assets/svg/2651.svg
	assets/svg/2653.svg
-php class bug
-ascii smiley option
-ios7 unicode fe0f alternates