Big mess

Sorry one big mess :-/
Merge branch 'master' of https://github.com/tritter/SystemValidation_AS1

Conflicts:
	satabs/main_nesting.c