many fixes
Merge branch 'master' of https://github.com/FUSEEProjectTeam/Publications

Conflicts:
	VeGA/Paper/template.tex