removed old reference
old file?
update license
Merge branch 'gulp' of github.com:sociam/indx into gulp

Conflicts:
	bower.json
	package.json
Merge branch 'gulp' into unstable

Conflicts:
	bower.json