Error.
Version jquery para el datepicker.
Temporal
Merge remote-tracking branch 'origin/master'

Conflicts:
	channelmanager/database.db
	static/bootstrap/js/bootstrap-dropdown.js
	static/commons/js/jquery-1.8.1.js
Test