change dev plan
django version from 1.5.2 to 1.6.2
add zinnia blog backend
private_setting
merge blog and weblog
Merge pull request #3 from thomaschuwm/develop

Develop