finish highlight mapping
finish first stage activity layout adjustment
finish first stage activity layout adjustment
finish test condition order
finsh second stage acivity
Merge branch 'master' of https://github.com/crazyplum/NSC