Develop

Overall Updates for georg from develop to master.
Please revert back to regular require (no requirejs)