Working on getting annotaitons back into view
Merge branch 'master' of https://github.com/romanzenka/swift

Conflicts:
	services/quameter-db/src/main/java/edu/mayo/mprc/quameterdb/dao/QuameterAnnotation.java

Fixed to correct SQL in QuamHiberDAO.
	Has ability to collect and show comments, hide/shows Protein IDs based on button selection.
Merge branch 'master' of https://github.com/romanzenka/swift

Conflicts:
	services/quameter-db/src/main/java/edu/mayo/mprc/quameterdb/dao/QuameterAnnotation.java

Fixed to correct SQL in QuamHiberDAO.
	Has ability to collect and show comments, hide/shows Protein IDs based on button selection.
Merge branch 'master' of https://github.com/romanzenka/swift
Merge pull request #31 from raymond301/master

Annotation and Protein IDs