Conflict between webpack and import-loader resolved#83

inkerton wants to merge 9 commits intoSunbird-Knowlg:masterSunbird-Knowlg/sunbird-generic-editor:masterfrom

inkerton:masterinkerton/sunbird-generic-editor:masterCopy head branch name to clipboard