update from django1.3 to django1.6
Merge branch 'master' of https://github.com/jerryxing98/timeline-site