Added icon font
Merge branch 'ionic'

Conflicts:
	www/templates/home.html
Changed tab rules for vim editors