refactor currentWifiInfo and fakeCurrentWifiInfo
Merge remote-tracking branch 'upstream/master'
remove my jquery

Conflicts:
	index.html
remove functions from running when script is loaded
revert to index.html on master
Added networkDataCollector to index.html script loading so networkAnalysis can get current wifi info and services can run activate
Merge pull request #14 from kuvelas/master

remove callback from currentWifiInfo