Merge branch 'servlets'
authorSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Mon, 25 Nov 2013 11:04:31 +0000 (11:04 +0000)
committerSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Mon, 25 Nov 2013 11:04:31 +0000 (11:04 +0000)
commit92420f700bca908529b5dc0e0e998dd2a7f98bc2
treecca61fd2505b6ef9f31b3f28bb48893023890a30
parent47b52039568cdbe9515e31d1e3e606f0d557cb30
parent8a0caa40d0fa288a0ad23f6af2aab1b0de0d50cd
Merge branch 'servlets'

Conflicts:
datadb/compbio/cassandra/StructureProteinPrediction.java
server/compbio/statistic/CassandraRequester.java
datadb/compbio/cassandra/CassandraReader.java
server/compbio/statistic/CassandraRequester.java