minor change
Building Block
Merge branch 'master' of https://github.com/urbien/urbini

Conflicts:
	templates.jsp
Merge branch 'master' of https://github.com/urbien/urbini

Conflicts:
	bundles.json
Merge branch 'master' of https://github.com/urbien/urbini
merge
integratinf with FT: showing FT articles related to the tradle
integratinf with FT: showing FT articles related to the tradle
integratinf with FT: showing FT articles related to the tradle