Updates to services
Merge branch 'master' of https://github.com/mmes2/Firefox-OS-News-Reader into sample
Beginning integration testing.
Merge branch 'master' of https://github.com/mmes2/Firefox-OS-News-Reader into sample

Conflicts:
	index.html
Merge Josh's code with mine, added logic to check alarm time, included services.js in index.html, issue still persists with networkAnalysis and fetcher.

Conflicts:
	scripts/services.js
 fix the protocol relative link
Fixed multiple alarm issue. Added currentWifiInfo and fakeCurrentWifiInfo to collector for use in analysis. Use fakeCurrentWifiInfo unless planning to run on a real phone since mozNetworkStats is not available on emulator
remove activate line at end of script
Merge remote-tracking branch 'upstream/master'
Merge pull request #11 from jeremysample/sample
Merge pull request #12 from kuvelas/master

currentWifiInfo added
bind the UI with story cache
 merge with upstream index.html