Font Awesome 4.1.0 Update
Merge branch 'master' of https://github.com/sanei-dengyo-jyoho/sed-shortcodes

Conflicts:
	README.md
	css/style-fonts.css
	css/style-fonts.min.css
	css/style.css
	css/style.min.css
	includes/admin-functions.php
	includes/core-functions.php
	readme.txt
	sed-shortcodes.php