all demo things removed
gitattributes modified
whoru-icons fonts path fixed (relative again)
data config
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gruntfile.js
	app/data/config.json
	app/data/contacts.json
	app/data/intro_en.json
	app/data/intro_es.json
styles