Add TOS link in footer, closes #451
Add blog link to menu
Merge pull request #484 from jj0hns0n/issue-480

Add blog link to menu
Adds user voice widget (must switch credentials before deploying)
Merge pull request #483 from jj0hns0n/issue-451

Add TOS link in footer, closes #451
Switch 'I am a human' to 'I agree to the Terms of Service'
Merge remote-tracking branch 'jj0hns0n/issue-469'
Merge pull request #485 from jj0hns0n/issue-469

Adds user voice widget (must switch credentials before deploying)
Merge remote-tracking branch 'jj0hns0n/issue-464'
Merge pull request #486 from jj0hns0n/issue-464

Switch 'I am a human' to 'I agree to the Terms of Service'
Merge branch 'master' of github.com:opengeo/mapstory
uploader - handle non-json error correctly
filter incomplete profile fixes

try to resolve avatar at gravatar if no primary uploaded one exists
mark profile incomplete on user creation
add test for profile incomplete
Merge branch 'master' into integration

Conflicts:
	models.py