fix compilation warning
udpate to scala 2.11.1 and reduce number of dependencies
Merge remote-tracking branch 'upstream/master' from Yann Simon
Merge branch 'master' into solution