Replaced references to gridelicous with perceptum
Merge remote-tracking branch 'origin/master'

Conflicts:
	frontend/templates/index.html