Pull from master and Bootstrap 3 upgrade of user profiles (incomplete)