import fix
fixed java 1.6 incompatibilities
Merge branch 'nick'
Merge branch 'master' of github.com:besuikerd/vip