4 stars, email fix
Merge branch 'master' of https://github.com/VictorSigma/robin-review

Conflicts:
	client/activities/ruberic/structure.html
	client/pages/views/panel.html