first commit
Merge branch 'master' of git://github.com/wishabhilash/appfog-django-1.5

Merging