Added django_generator
Merge branch 'deploy' of github.com:AmoghReddy/engineer2013 into deploy
Added django based output
Merge branch 'contentManagement' of github.com:AmoghReddy/engineer2013 into contentManagement
Done with merging