Merge branch 'hotfix/fix_package'
Merge branch 'develop'
Changed setup.py
Changed import errors in several files
changed setup.py
Added ordereddict to py26 version
Changed import Annotation_tools to Annotate_models
Fixed setup.py merge conflict