Add FontAwesome
Merge branch 'master' of github.com:kiln/iied

Conflicts:
	cities/site/index.html