Java 8 adaptations
Java 8 adaptations
Added StreamUtil
Added toMap
Cosmetic changes
Cosmetic changes
Removed unused class
Netbeans configuration