Adding questions...
Adding change password page
Making change password to live behind authed
Solving merge conflicts
Conflict resolution
Merge branch 'master' of github.com:biocore/american-gut-web into suvery_questions_locale
Survey questions represent
removed extra whitespace
added to text_locale
Survey support structures
added question types
Merge branch 'master' of github.com:biocore/american-gut-web into suvery_questions_locale

Conflicts:
	amgut/lib/locale_data/american_gut.py
Addressing comments
group info for @adamrp
group titles
dump dicts sorted by key
Merge pull request #118 from wasade/suvery_questions_locale

Suvery questions locale
Merge pull request #109 from josenavas/issue-97

Adding change password page