Fix Automated SPI Location switching
Merge branch 'master' of https://github.com/matthiasmiun/fsm-framework into HEAD

Conflicts:
	libs