Added Metric for tracking moving averages
Added Metric for tracking moving averages
Merge master.
Merge branch 'merging'

Conflicts:
	pom.xml
	src/main/java/org/lantern/data/ServerFriend.java
	src/test/java/org/lantern/DatastoreTest.java