basic metrics calculation based on static variables
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/msc/prototype/contentprovider/ContextProvider.java
	app/src/main/java/msc/prototype/contentprovider/MainActivity.java
	app/src/main/java/msc/prototype/contentprovider/Metrics.java
	app/src/main/java/msc/prototype/contentprovider/RecordMetric.java
	app/src/main/res/layout/activity_main.xml