fix scaladoc
Update README for 1.1 and 1.2
Don't forget to close tags ending at the end of the block
Merge branch 'master' into 1.1.x