clean up
Merge branch 'submaster' of github.com:armmimic/SAI into Lukasz