added rspec, refactored css, added temporary patch for ldap telephonenumber in user_controller.rb
resolved the encoding of the ark and of the filename
fixed the ark encoding and file encoding bug on the version landing page
some changes
changes
added gitignore file
ark encoding
telephonenumber ldap field set to nil whene the parameter is ""
gem debugger instead of gem ruby-debug
remove ldap requirements
nothing
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
upgrade to rails 3.2.13 and add capybara