Added paperclip gem to avoid error https://github.com/thoughtbot/paperclip/issues/1088 and got the latest sufia 3 (3.7.2) to avoid gem clash
schema modified by Sufia update
Added all of the template files from Sufia 3.7.2 into ora-hydra
so OneLtd have all of the template files available to edit
Modified the cud endpoint to point to local ftp forwarded port
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile
	app/views/catalog/_home.html.erb
	app/views/catalog/_index_partials/_list_files.html.erb
	app/views/catalog/index.html.erb
	app/views/dashboard/_facets.html.erb
	app/views/layouts/homepage.html.erb
	app/views/users/_social_media_info.html.erb
Disabled RT
Merge branch 'master' of https://github.com/anusharanganathan/oraingest into one
Add Ora styling from One
Modify header and footer. Change layouts to use new structure
add images and adjust scss and erb files to use image-url and img_tag to remove hard-coded paths
add accordion styling
Add code for: dashboard, publication browser, record page, DDA, contact, signup, and login pages
Add custom JS from One
Add datasets page styles
Backup - 20141115
Adjust sufia two column layout to fix alignment issues and introduce custom header elements
Change datasets and publications to use sufia two col layout as they should be
start work on form validation bar thingies
Add custom header section to yeilds in one column
Remove javascript from footer. Add ora_form_progress in seperate JS file temporarily