add FontAwesome
Merge branch 'master' of https://github.com/askaza/artkadabra

Conflicts:
	code/front/css/common.css
styles