-> Additional work, styling and otherwise,  to User Account section.
-> Adds additional parameters to user info update form helper.
-> Adds tabs for pending / accepted / past reservations to 'History' page (will become 'Requests' page)
-> Adds nav pills for 'History' page to indicate ownership
Add .gitignore, additional template changes to User Profile page.
Add Bootstrap to tracked files.
Merge branch 'development' of http://github.com/felguerez/gear2peer into account_profile

Conflicts:
	web/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.eot
	web/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.svg
	web/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf
	web/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.woff
	web/vendor/assets/javascripts/bootstrap.js
	web/vendor/assets/javascripts/bootstrap/affix.js
	web/vendor/assets/javascripts/bootstrap/alert.js
	web/vendor/assets/javascripts/bootstrap/button.js
	web/vendor/assets/javascripts/bootstrap/carousel.js
	web/vendor/assets/javascripts/bootstrap/collapse.js
	web/vendor/assets/javascripts/bootstrap/dropdown.js
	web/vendor/assets/javascripts/bootstrap/modal.js
	web/vendor/assets/javascripts/bootstrap/popover.js
	web/vendor/assets/javascripts/bootstrap/scrollspy.js
	web/vendor/assets/javascripts/bootstrap/tab.js
	web/vendor/assets/javascripts/bootstrap/tooltip.js
	web/vendor/assets/javascripts/bootstrap/transition.js
	web/vendor/assets/stylesheets/_bootstrap-compass.scss
	web/vendor/assets/stylesheets/_bootstrap-mincer.scss
	web/vendor/assets/stylesheets/_bootstrap-sprockets.scss
	web/vendor/assets/stylesheets/bootstrap.scss
	web/vendor/assets/stylesheets/bootstrap/_alerts.scss
	web/vendor/assets/stylesheets/bootstrap/_badges.scss
	web/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss
	web/vendor/assets/stylesheets/bootstrap/_button-groups.scss
	web/vendor/assets/stylesheets/bootstrap/_buttons.scss
	web/vendor/assets/stylesheets/bootstrap/_carousel.scss
	web/vendor/assets/stylesheets/bootstrap/_close.scss
	web/vendor/assets/stylesheets/bootstrap/_code.scss
	web/vendor/assets/stylesheets/bootstrap/_component-animations.scss
	web/vendor/assets/stylesheets/bootstrap/_dropdowns.scss
	web/vendor/assets/stylesheets/bootstrap/_forms.scss
	web/vendor/assets/stylesheets/bootstrap/_glyphicons.scss
	web/vendor/assets/stylesheets/bootstrap/_grid.scss
	web/vendor/assets/stylesheets/bootstrap/_input-groups.scss
	web/vendor/assets/stylesheets/bootstrap/_jumbotron.scss
	web/vendor/assets/stylesheets/bootstrap/_labels.scss
	web/vendor/assets/stylesheets/bootstrap/_list-group.scss
	web/vendor/assets/stylesheets/bootstrap/_media.scss
	web/vendor/assets/stylesheets/bootstrap/_mixins.scss
	web/vendor/assets/stylesheets/bootstrap/_modals.scss
	web/vendor/assets/stylesheets/bootstrap/_navbar.scss
	web/vendor/assets/stylesheets/bootstrap/_navs.scss
	web/vendor/assets/stylesheets/bootstrap/_normalize.scss
	web/vendor/assets/stylesheets/bootstrap/_pager.scss
	web/vendor/assets/stylesheets/bootstrap/_pagination.scss
	web/vendor/assets/stylesheets/bootstrap/_panels.scss
	web/vendor/assets/stylesheets/bootstrap/_popovers.scss
	web/vendor/assets/stylesheets/bootstrap/_print.scss
	web/vendor/assets/stylesheets/bootstrap/_progress-bars.scss
	web/vendor/assets/stylesheets/bootstrap/_responsive-embed.scss
	web/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss
	web/vendor/assets/stylesheets/bootstrap/_scaffolding.scss
	web/vendor/assets/stylesheets/bootstrap/_tables.scss
	web/vendor/assets/stylesheets/bootstrap/_theme.scss
	web/vendor/assets/stylesheets/bootstrap/_thumbnails.scss
	web/vendor/assets/stylesheets/bootstrap/_tooltip.scss
	web/vendor/assets/stylesheets/bootstrap/_type.scss
	web/vendor/assets/stylesheets/bootstrap/_utilities.scss
	web/vendor/assets/stylesheets/bootstrap/_wells.scss
	web/vendor/assets/stylesheets/bootstrap/bootstrap.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_alerts.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_background-variant.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_border-radius.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_buttons.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_center-block.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_clearfix.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_forms.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_gradients.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_grid.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_hide-text.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_image.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_labels.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_list-group.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_nav-divider.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_nav-vertical-align.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_opacity.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_pagination.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_panels.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_progress-bar.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_reset-filter.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_resize.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_size.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_tab-focus.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_table-row.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_text-overflow.scss
	web/vendor/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss
AJAX for user's Reviews in User Account section.
Merge branch 'development' of http://github.com/felguerez/gear2peer into account_profile
Merge pull request #118 from felguerez/listing_page

merging mess complete
Styling users' reviews page.
Merge branch 'development' of http://github.com/felguerez/gear2peer into account_profile

Conflicts:
	lib/air_cycle.rb
	web/app/assets/stylesheets/listings.css.scss
Merge pull request #119 from felguerez/account_profile

Merging account/profile additions (AJAX reviews, listings) into development
Merge branch 'development' of https://github.com/felguerez/aircycle into listing_page

Conflicts:
	lib/air_cycle.rb