mima
mima

(cherry picked from commit 9ca5182dee99df5d4d8000c47a790f09f855ed5d)

# Conflicts:
#	project/BuildSettings.scala

mkurz/playframework,marcospereira/playframework,playframework/playframework,mkurz/playframework,playframework/playframework,marcospereira/playframework,mkurz/playframework,marcospereira/playframework,mkurz/playframework,playframework/playframework,marcospereira/playframework