Support to Play 2.6.1 and Scala 2.12.2#7

rayronvictor wants to merge 2 commits intodigiPlant:masterdigiPlant/play-res:masterfrom

rayronvictor:masterrayronvictor/play-res:masterCopy head branch name to clipboard