Shivam's Work
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/GPL.iml
	.idea/jsLibraryMappings.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Added few more paths. I suppose the paths are done