Merge pull request #13 from nhanhuynh/master

Binding the story Cache with the UI
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
more comments. rearranged some functions
Added more comments
fixed manifest
Merge pull request #15 from kuvelas/master

Ready for code review
Refactored networkAnalysis.js to work with changes made to the data structure of the network data base and the new file genFakeData.js.
Added check for mozWiFiManager to currentlyFetchable().
Added whitespace to index.html for readability
Updated services to include activation function but was unable to get it to work as it's own namespace.  To solve this I've moved my working code to services_noNS.js.  It shouldn't be an issue to use services in this manner as it's how most apps are built on firefox but I can work on this over the weekend to address it.  Also still unable to get anything from netStats.nextBestDate
Merge pull request #16 from jeremysample/sample

Sample
Update index.html
Update style.css
Create index_content.html
adding chris' changes manualy since github can't automatically merge pull request