Fixed syntax error
Merge remote-tracking branch 'origin/master'

Conflicts:
	data.json
Merge remote-tracking branch 'origin/gh-pages'
Merge branch 'gh-pages'
Added teknique
Added Spidertracks
Added Summa BI
Added Parrot Analytics
Added Nextspace
Added eBUS
Misc - remove protocol
Added Xtracta
Added Star86
Added Orcon
Added Swingprofile
Added Konnect NET