done button
Merge branch 'workingcopy' into beta
Various bug fixes and performance enhancements