agrego html de convocatorias
Merge branch '2013-alpha' of https://github.com/mrazzari/ux2012 into 2013-alpha
Merge branch '2013-alpha' of https://github.com/mrazzari/ux2012 into 2013-alpha
Merge branch '2013-alpha' of https://github.com/mrazzari/ux2012 into 2013-alpha

Conflicts:
	assets/css/styles.css
Merge branch '2013-alpha' of https://github.com/mrazzari/ux2012 into 2013-alpha
Merge branch '2013-alpha' of https://github.com/mrazzari/ux2012 into 2013-alpha
Merge branch '2013-alpha' of https://github.com/mrazzari/ux2012 into 2013-alpha

Conflicts:
	assets/css/styles.css
cambio texto