use javascriptmin files, revamp settings page.
twitter/bootstrap uses font awesome now.
Merge remote-tracking branch 'rt/master'

Conflicts:
	app/assets/javascripts/application.js
	app/controllers/market_place_controller.rb
	app/views/market_place/new.html.erb
	app/views/users/_header.html.erb
pull raj's changes.
Merge remote-tracking branch 'rt/master'
marketplace span 12 to span11 to fit in small formfactors, sshindex bug
Merge remote-tracking branch 'rt/master'

Conflicts:
	app/controllers/market_places_controller.rb
	app/views/market_places/_category_view_form.html.erb
	app/views/market_places/market_place_app_show.html.erb
merge
fix to make sshkeys load when no keys exists, alignment marketplace
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/market_places_controller.rb
	app/views/market_places/_category_view_form.html.erb
	app/views/market_places/market_place_app_show.html.erb
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/market_places/_category_view_form.html.erb
	app/views/market_places/market_place_app_show.html.erb