first attempt
addressing comments
Merge branch 'master' of github.com:biocore/american-gut-web into loc_change_pass_verify.html
removing hex
Minor tweaks
Merge branch 'master' of github.com:biocore/american-gut-web into dietlogupdates
Revising portal diet log mention, removed Titos how to as it isn't relevant any more
Removed entry for Tito's blog
6months to a few months
upstream master
Merge branch 'master' of github.com:biocore/american-gut-web into dietlogupdates

Conflicts:
	amgut/lib/locale_data/american_gut.py
Fixing issue 102
fixing error
Merge pull request #99 from wasade/dietlogupdates

Dietlogupdates
localizing
added spacing for _PORTAL
Merge branch 'master' of github.com:biocore/american-gut-web into new_participant_locale

Conflicts:
	amgut/lib/locale_data/american_gut.py
Merge pull request #104 from josenavas/issue-102

Fixing issue 102
break out text on international page
fix international_shipping link on no_auth_sitebase