Merge pull request #253 from VirtualFlyBrain/master

Bringing up to date
Merge pull request #259 from VirtualFlyBrain/master

bringing up to date
Merge pull request #266 from VirtualFlyBrain/master

changed timing for jenkins updating
Merge pull request #275 from VirtualFlyBrain/master

bringing up to date
Merge pull request #278 from VirtualFlyBrain/master

changed for jenkins deployment
Merge pull request #286 from VirtualFlyBrain/master

bringing up to date
Merge pull request #296 from VirtualFlyBrain/master

Bringing up to date
Merge pull request #302 from VirtualFlyBrain/master

Bringing up to date
updating fbbt and vfb versions to latest - May release of FBbt + latest annotations on fc individuals.
Update about_us.htm
Merge branch 'Sandbox-Server'

Updated owl.
Updated about us resolves #309