.
Merge branch 'master' of https://github.com/hallmao/Projeto-IC-2014

Conflicts:
	Integracao Final/FINAL6/ODE_methods.pyc
	Integracao Final/FINAL6/embeddedImage.pyc
	Integracao Final/FINAL6/v5_support.pyc