delete trash
upgrade to django 1.5
Merge pull request #24 from narusemotoki/develop

Develop