Bug fix for loading panel
Merge branch 'master' of http://github.com/mkarpoff/414-Research