bug fixes
Merge branch 'master' of github.com:mwaylabs/TMP2
renamed selector.js to data_selector.js