some changes
Merge branch 'home-page-restyle' into methodbox-rails3-update

Conflicts:
	Gemfile
	app/assets/javascripts/surveys_table.js
	app/assets/javascripts/variables_table.js
	app/assets/javascripts/yui/connection/connection-min.js
	app/assets/javascripts/yui/container/container-min.js
	app/assets/javascripts/yui/cookie/cookie-min.js
	app/assets/javascripts/yui/datasource/datasource-min.js
	app/assets/javascripts/yui/datatable/datatable-min.js
	app/assets/javascripts/yui/datatable/datatable_expander.js
	app/assets/javascripts/yui/datatable/variable_table_expander.js
	app/assets/javascripts/yui/element/element-min.js
	app/assets/javascripts/yui/history/assets/blank.html
	app/assets/javascripts/yui/history/history-min.js
	app/assets/javascripts/yui/json/json-min.js
	app/assets/javascripts/yui/paginator/paginator-min.js
	app/assets/javascripts/yui/tabview/assets/border_tabs.css
	app/assets/javascripts/yui/tabview/assets/loading.gif
	app/assets/javascripts/yui/tabview/assets/skin-sam.css
	app/assets/javascripts/yui/tabview/assets/skins/sam/tabview-skin.css
	app/assets/javascripts/yui/tabview/assets/skins/sam/tabview.css
	app/assets/javascripts/yui/tabview/assets/tabview-core.css
	app/assets/javascripts/yui/tabview/assets/tabview.css
	app/assets/javascripts/yui/tabview/tabview-min.js
	app/assets/javascripts/yui/yahoo-dom-event/yahoo-dom-event.js
	app/assets/stylesheets/container/assets/alrt16_1.gif
	app/assets/stylesheets/container/assets/blck16_1.gif
	app/assets/stylesheets/container/assets/close12_1.gif
	app/assets/stylesheets/container/assets/container-core.css
	app/assets/stylesheets/container/assets/container.css
	app/assets/stylesheets/container/assets/hlp16_1.gif
	app/assets/stylesheets/container/assets/info16_1.gif
	app/assets/stylesheets/container/assets/skins/sam/container-skin.css
	app/assets/stylesheets/container/assets/skins/sam/container.css
	app/assets/stylesheets/container/assets/tip16_1.gif
	app/assets/stylesheets/container/assets/warn16_1.gif
	app/assets/stylesheets/datatable/assets/datatable-core.css
	app/assets/stylesheets/datatable/assets/datatable.css
	app/assets/stylesheets/datatable/assets/skins/sam/datatable-skin.css
	app/assets/stylesheets/datatable/assets/skins/sam/datatable.css
	app/assets/stylesheets/datatable/assets/skins/sam/dt-arrow-dn.png
	app/assets/stylesheets/datatable/assets/skins/sam/dt-arrow-up.png
	app/assets/stylesheets/paginator/assets/paginator-core.css
	app/assets/stylesheets/paginator/assets/skins/sam/paginator-skin.css
	app/assets/stylesheets/paginator/assets/skins/sam/paginator.css
	app/assets/stylesheets/tabview/.DS_Store
	app/assets/stylesheets/tabview/assets/border_tabs.css
	app/assets/stylesheets/tabview/assets/loading.gif
	app/assets/stylesheets/tabview/assets/skin-sam.css
	app/assets/stylesheets/tabview/assets/skins/sam/tabview-skin.css
	app/assets/stylesheets/tabview/assets/skins/sam/tabview.css
	app/assets/stylesheets/tabview/assets/tabview-core.css
	app/assets/stylesheets/tabview/assets/tabview.css
	app/views/layouts/main.html.erb
	config/routes.rb
	public/javascripts/datatable_expander.js
	public/javascripts/variable_table_expander.js
	public/javascripts/yui/datatable/datatable_expander.js
	public/javascripts/yui/datatable/variable_table_expander.js
	public/stylesheets/datatable/assets/skins/sam/dt-arrow-dn.png
	public/stylesheets/datatable/assets/skins/sam/dt-arrow-up.png
	public/stylesheets/paginator/assets/paginator-core.css
	public/stylesheets/paginator/assets/skins/sam/paginator.css
	public/stylesheets/yui/assets/skins/sam/dt-arrow-dn.png
	public/stylesheets/yui/assets/skins/sam/dt-arrow-up.png
	public/stylesheets/yui/assets/skins/sam/paginator.css
	public/stylesheets/yui/assets/skins/sam/yuitest.css
add devise for auth
migration form restful auth to devise
various routes and constants changing
first rails 3.x version which returns search results
use prototype alongside jquery
move old rails 2.3 application js to its own js file