remove twitter from popup login
Merge pull request #842 from drwelby/611-social

remove twitter from popup login
fix header nav
Merge pull request #843 from drwelby/611-social

fix header nav
Merge branch 'master' into integration
Merge branch 'iss-803-askbot-widget'
Merge branch 'issue-660-new-annotations'

Conflicts:
	.gitignore
Merge branch 'master' into integration
Merge branch 'iss-549-time-attribute-list'
Merge branch 'master' into integration