add font-awesome.css and modify actionMy()
Merge origin/master

Conflicts:
	fonts/glyphicons-halflings-regular.svg