some changes
changes
gem debugger instead of gem ruby-debug
remove ldap requirements
added gitignore
added gitignore
nothing
nothing
nothing
Timezone bug fixed
Merge branch 'ruby193'

Conflicts:
	app/controllers/user_controller.rb
	log/development.log
	tmp/cache/993/230/demo_merritt_file_count
	tmp/cache/9A9/380/demo_merritt_total_size
	tmp/cache/A6A/880/demo_merritt_object_count
	tmp/cache/AF9/DD0/demo_merritt_version_count
fixed Timezone bug