temp commit
Merge branch 'master' of https://github.com/romanzenka/swift

Conflicts:
	swift/web/src/main/webapp/quameter/index.jsp
Merge branch 'master' of https://github.com/romanzenka/swift

Conflicts:
	swift/web/src/main/webapp/quameter/index.jsp
Merge pull request #34 from raymond301/master

slight changes to graphs and protein id fix