Merged development into my branch. Add 'bio' to User Account form
Merge branch 'development' of http://github.com/felguerez/gear2peer into account_profile
thumbee circle has profile actual prof photo
Merge branch 'development' of https://github.com/felguerez/gear2peer into thumbee-circle
Adds a view for another users profile.
Fixes the thumbee circles to actually display the profile photo.
Merge branch 'development' of https://github.com/felguerez/gear2peer into thumbee-circle

Conflicts:
	web/app/controllers/users_controller.rb
Merge branch 'master' of http://github.com/felguerez/gear2peer into account_profile
Merge pull request #129 from felguerez/thumbee-circle

Thumbee circle
adds default photo for users who don't have a profile photo yet
Merge branch 'development' of https://github.com/felguerez/aircycle into development
adds star rating method to reviews in show listing page
nav bar search now works
adds needed indentation to listings text.
removes unused views
Updates to User Account section styling. Moves Image Upload to the left-hand 'vitals' rail
Merge pull request #131 from felguerez/account_profile

Account profile
users edit profile now submits via ajax
Merge branch 'development' of https://github.com/felguerez/aircycle into development
cleans assorted stuff up
Merge branch 'development' of https://github.com/felguerez/gear2peer into janitor
nav bar search and nav bar prof photo