Merge branch 'gsurvey' into survey2.0

Conflicts:
.gitignore
SurveyEditor/templates/editor.html
SurveyEditor/templates/home.html
SurveyEditor/templates/registration/login.html
db.sqlite3