Change the names of the index for "sb_posts" table as they were the same for
the "posts" table, causing a conflict in migration 60.
Don't know if this is right. Added "html_options" parameter to date_select
and datetime_select in the globalite plugin in localized_action_view.rb.
This is to handle ActiveSupport 2.1.1.
Merge branch 'master' of git://github.com/bborn/communityengine into bborn/master
Merge branch 'bborn/master'

Conflicts:

	engine_plugins/globalite/lib/rails/localized_action_view.rb
Merge branch 'edge' of git://github.com/bborn/communityengine
Fixed SBPost Count in View
Eliminated Login format validation, unqiueness, and length limit
Merge branch 'edge' of git://github.com/bborn/communityengine into edge
Made rails_asset_extentions.rb include AssetHelpers idempotent
Merge branch 'edge' of http://github.com/bborn/communityengine into edge-merge
Since we went to non-unique login names we made the login-slug to include "-id" or -user.count if not yet assigned.
Added Timeformats to es-MX.
Merge branch 'edge' of http://github.com/bborn/communityengine into edge-merge-bborn-edge

Conflicts:
	app/models/user.rb

This conflict concerned our modification of the login slug to include the user number.
Merge branch 'edge' of http://github.com/bborn/communityengine into edge-merge-bborn-edge
Merge branch 'master' of http://github.com/bborn/communityengine

Conflicts:
	app/models/user.rb
Added necessary gems to the gemspec
Modified application html file and some of the related files to go with bootstrap.

This is just a starting point on creating a bootstrap version, checking to see how it looks.
Fixed inconsistent spacing

There's gotta be a better way to test & fix a gem, right?
Fixed the way the sass file points to bootstrap and fontawesome
Changed css and updated Readme to include necessity to add dependencies to Gemfile.

Unless you do this, the paths don't work and sprockets can't find the bootstrap and fontawesome files.