updated demo build to use grunt-origami-demoer
Merge branch 'master' of https://github.com/Financial-Times/o-grid

Conflicts:
	bower.json