added new gitignore for deploy script
temp commit quameter index
Merge branch 'master' of https://github.com/romanzenka/swift

Conflicts:
	.gitignore
	swift/web/src/main/webapp/quameter/index.jsp
Merge branch 'master' of https://github.com/romanzenka/swift
Add script to condense Curation table in db
UPdate script to condense Curation table, fix GSON incompatability "\|"
Removed curation steps tables, replaced with json string in Curation table
Merge branch 'master' of https://github.com/romanzenka/swift

Conflicts:
	lib/db-curator/src/main/resources/edu/mayo/mprc/dbcurator/model/curationsteps/CurationStep.hbm.xml
Merging in Raymond's code.