Merge branch 'release-1.0' into develop
add human-readable names for models and theire attributes, unit testing verbose name for pub_date
add choices to poll admin page
comment fail() at the end of fts/tests.py
Merge branch 'feature-part2' into develop
version to 1.1
Merge branch 'release-1.1'