Updated DB connectivity (again)
Merge branch 'kolais' of github.com:arrayexpress/annotare2 into kolais
Merge branch 'kolais' into develop