Merge, spero di averlo fatto giusto.
Merge branch 'master' of
https://github.com/WebActivities/webactivities-os

Conflicts:
	WebActivities/js/framework.js