Merge branch 'master' into twitter

Conflicts:
	totalimpactwebapp/static/dist/ImpactStory.js
change logo yay!
temp
Merge branch 'twitter'
landing page first go done.
save point.
profile page shows different logo (smaller, on left).
add sideways logo
fix profile logo margin issue.
replace "ImpactStory" with "Impactstory".
add a bit of space to landing page orange part.
merge master