Merged in develop (pull request #1)

merge django 1.6
Merge pull request #6 from mwolff44/master

Merged in develop (pull request #1)