Updated user-homepage for splash
Fixed bug in splash display
Merge branch 'master' into splash_posts

Conflicts:
	app/views/sign_up.haml
Merge branch 'splash_posts'