show IF and THEN on a new Tradle
new facet 'iconFont' to show the types of notifications without using images; tags on Feature do not show good
Merge branch 'master' of https://github.com/urbien/urbini

Conflicts:
	js/utils.js
Merge branch 'master' of https://github.com/urbien/urbini
fixing title for trades
Merge branch 'master' of https://github.com/urbien/urbini