Nueva version 11 AGO 2014
Merge branch 'master' of https://github.com/estrategasdigitales/pippi

Conflicts:
	academicos.php
	index.php