Made grid bag layout
Merge branch 'master' into gridbag

Conflicts:
	src/edu/lclark/drosophila/ButtonPanel.java