Upgrade FontAwesome to 4.0.3
Revert some vendor files that shouldn't have been touched
Several refinements after fontawesome upgrade
Self review for fontAwesome upgrade
Merge branch 'bootstrap3' of https://github.com/oaeproject/3akai-ux into fontAwesome
Fix issue with collapse icon in left hand navigation
Merge origin/bootstrap3 and fix conflicts
Reform the user clip
Reform the group clip
Reform the content clip
Reform the discussion clips
Merge origin/bootstrap3 and fix conflicts
Merge origin/master and fix conflicts
Sort the bundles in /ui/bundles
Merge origin/master and fix conflicts
Create the aboutcontent widget
Merge branch 'master' of https://github.com/oaeproject/3akai-ux into issue-3666
Merge origin/master and fix conflicts
Merge branch 'master' of https://github.com/oaeproject/3akai-ux into issue3692

Conflicts:
	admin/index.html
	node_modules/oae-core/register/register.html
	node_modules/oae-core/revisions/revisions.html
	node_modules/oae-core/topnavigation/topnavigation.html
	shared/oae/css/oae.components.css
	shared/oae/macros/list.html
	ui/me.html
address merge conflicts