Merge pull request #513 from jonohart/web

Moved javascript files for Masa's GUI back out of the floodlight web directory