Fixes bug 222
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/datavyu/views/DatavyuView.java
Fixed whatever it was I just did