Fixed broken test and removed gradle. IntelliJ 13.1
Fixed broken test and removed gradle. IntelliJ 13.1
reorganized imports