frontend
Merge branch 'master' of https://github.com/vshulev/Openminds-Team-Rocket

Conflicts:
	Shepherd/app.js