Fix include/exclude of accounts; cleanup
Merge branch 'master' into xwt
Cleanup

- remove SWF dependency
- update version number in AssemblyInfo file