Merge branch 'master' of https://github.com/gsi-upm/Sefarad

Conflicts:
	build/js/mvvm.js