change web disatcher from if-else to disatcher table
tidy up and remove THREAD_JOIN
Merge branch 'refactors_1_0' into development_1_0