Footer, VIDEO page SocialBookmark, User Page Tabs
Merge https://github.com/rebellabs/mmagap

Conflicts:
	app/views/users/show.html.erb
Footer, VIDEO page SocialBookmark, User Page Tabs