rollback parada
Alfa1  hasta form 3 OK
Merge branch 'workin-rama' of https://github.com/asael2/satensweb into workin-rama

Conflicts:
	wp-content/themes/twentytwelve/js/_notes/dwsync.xml
	wp-content/themes/twentytwelve/js/custom.js