Movido Siesta a src
gitignore added
Merge remote-tracking branch 'JEqualityProject/devel' into devel

Conflicts:
	.gitignore