Merge branch 'master' into dev-server
reverted to old schema for expression pattern individuals. Hopefully just temporary fix.
Moving google analytics to footer

Avoid having multiple locations and ensures is on all pages.
Merge branch 'Dev-Server'

Merged:
	jsp/includes/bits/cellar.jsp
Merge pull request #46 from VirtualFlyBrain/master

Moving google analytics to footer
Merge pull request #47 from VirtualFlyBrain/dev-server

Moving DOS's changes to master
Merge pull request #48 from VirtualFlyBrain/master

Pushing changes to Dev server