convert to kotlin#1

martinsachs wants to merge 2 commits intoghostcity:masterghostcity/spring-controller-testing:masterfrom

martinsachs:mastermartinsachs/spring-controller-testing:masterCopy head branch name to clipboard