Removed dependency to java.nio, changed JDK to 1.6
Merge remote-tracking branch 'origin/master'