Change for NetBeans7.3
Update version number to 0.6.0
Merge branch 'nb73'