Merge pull request #1 from mmes2/master

sync repos
Delete networkDatabase.js.orig
Delete networkDataCollector.js.orig
Better version
Updates to services
Merge branch 'master' of https://github.com/mmes2/Firefox-OS-News-Reader into sample
All api's working except to test if the connection is metered. Sent and rec data is not working after phone looses wifi connection for a time. When that happens, the sent/rec bytes goes way way up and never moves again. This may not be my bug, but a bug with the api
fixed index.html
Everything working except alarm, which on long intervals, triggers multiple times
Merge remote-tracking branch 'upstream/master'
New: Generator to add fake data to network database.
added genFakeMonth
Merge pull request #9 from kuvelas/master

Ready for integration #2
Merge remote-tracking branch 'upstream/master'
Beginning integration testing.
Merge branch 'master' of https://github.com/mmes2/Firefox-OS-News-Reader into sample

Conflicts:
	index.html
actual tested code
Merge pull request #10 from Josh-Willhite/master

services update
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