BZ-13179 added Font Awesome Icon
Merge branch 'RC20140807' into integration