Merge branch 'IDI-115'
IDI-116 add manual block to retreive API 1.1 twitter feeds
IDI-116: update fluid twitter feed
IDI-116: Refactor twitter feed code to a single function, re-usable for all feeds
Merge branch 'IDI-116' into development

Conflicts:
	style.css