Merge branch 'master' into java8

Conflicts:

vanillapull/webapp/src/main/java/com/octo/vanillapull/monitoring/writers
/LogWriter.java

vanillapull/webapp/src/main/java/com/octo/vanillapull/service/BaseThread
edMonteCarlo.java

vanillapull/webapp/src/main/java/com/octo/vanillapull/service/synchroniz
ation/ForkMultiThreadedMonteCarlo.java

vanillapull/webapp/src/main/java/com/octo/vanillapull/service/synchroniz
ation/MonoThreadedMonteCarlo.java

vanillapull/webapp/src/main/java/com/octo/vanillapull/service/synchroniz
ation/PoolMultiThreadedMonteCarlo.java

vanillapull/webapp/src/test/java/com/octo/vanillapull/service/synchroniz
ation/BaseMonteCarloTest.java