Merge branch 'develop' of git://github.com/pablocubico/diaspora into develop
Merge branch 'develop' of https://github.com/diaspora/diaspora into develop
before_filter for bootstrap added to the controllers
Settings navigation is now a Bootstrap Tab Nav
header padding for profile edit, user account, privacy and services pages, added a generic padder to be removed when everything is ported
bootstrap styles and minor enhancements on the  profile edit page
fixing styles for photo upload with bootstrap
user account edit page ported to bootstrap
removed create from only parameter in services controller, for the bootstrap before_filter
bootstrap grid for privacy page
missing row-fluid divs, needed for consistency
Merge pull request #1 from pablocubico/feature/4466-bootstrap-config-profile-page

Feature/4466 bootstrap config profile page