add django 1.6 transaction support and revert django 1.6 project layout