Automated merge with https://code.google.com/p/annotation-tools
Automated merge with https://code.google.com/p/annotation-tools

typetools/annotation-tools,eisop/annotation-tools,typetools/annotation-tools,eisop/annotation-tools,eisop/annotation-tools,typetools/annotation-tools