small changes to neuroelectro website code to fix minor bugs and make improvements to where fancybox is being used
fixed merge conflicts in views.py