Merge origin/master

Conflicts:
	js/views/pages/CalendarioView.js
Merge origin/master
Merge origin/master

Conflicts:
	js/views/pages/CalendarioView.js
Merge origin/master