Merge origin/master

Conflicts:
	UserRecognitionWithClustering/src/main/java/uni/EISIC14/analysis/AnalyzeTime.java