Merge changes from MAXIMA into WikiBrain
Merge remote-tracking branch 'remotes/origin/master' into maxima-survey

Conflicts:
	wikibrain-cookbook/src/main/java/org/wikibrain/cookbook/sr/SimilarityExample.java
	wikibrain-cookbook/src/main/java/org/wikibrain/cookbook/wikidata/ShowStatements.java
	wikibrain-core/src/main/java/org/wikibrain/core/dao/sql/WpDataSource.java
	wikibrain-pageview/src/main/java/org/wikibrain/pageview/PageViewDbDao.java
	wikibrain-pageview/src/main/java/org/wikibrain/pageview/PageViewDbDaoCookbook.java
	wikibrain-pageview/src/main/java/org/wikibrain/pageview/PageViewDbDaoExample.java
	wikibrain-pageview/src/main/java/org/wikibrain/pageview/PageViewIterator.java
	wikibrain-pageview/src/main/java/org/wikibrain/pageview/PageViewLoader.java
	wikibrain-pageview/src/main/java/org/wikibrain/pageview/PageViewSqlDao.java
	wikibrain-sr/src/main/java/org/wikibrain/sr/milnewitten/MilneWittenMetric.java
	wikibrain-sr/src/main/java/org/wikibrain/sr/vector/VectorBasedMonoSRMetric.java