visual changes
Merge branch 'master' of github.com:1dece/2013

Conflicts:
	public/css/national.css
	public/js/hora.js
update
Merge branch 'master' of github.com:1dece/2013