Nasty bug in parser that generates error if there is a blank line in the manifest list file
Minor change to correct bug if there is a blank line in the manifest list file
Merge branch 'master' of https://github.com/afmurillo/FinalHerramientas-2014-2

Conflicts:
	ProyectoFinal/Codigo/manifestParser.py