Upgrade to play 2.3.6
Updated readme for play 2.3.6 upgrade
Merge branch 'master' into play2.3

Conflicts:
	project/plugins.sbt
Play 2.3.7