updated figure placement
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc/latex/results_and_discussion.tex
merge
Merge remote-tracking branch 'origin/master'