updated timeout, added system properties for JDK 7
Merge branch 'master' of https://github.com/yogthos/luminus