netbeans pre migration
advanced associations prototype and minor bug fixes
Merge branch 'master' of https://github.com/mfrailis/DAS