start implementation of two stage SLD
merge master
username required, not finished yet
2 stage SLD coding complete, not tested yet
clean up, tests added
Merge branch 'twoStageSLD'
Merge branch 'master' into dev