Aggiunta funzionalità di popup relativo
Merge branch 'master' of
https://github.com/WebActivities/webactivities-os

Conflicts:
	WebActivities/css/app.css
	WebActivities/partials/home.html
Merge remote-tracking branch 'origin/master'