uuu
Merge branch 'master' of https://github.com/luqizheng/SeajsBundle

Conflicts:
	src/SeajsBundle/Seajs/CombineModule.cs
	src/SeajsBundle/Seajs/ModualIdSets.cs
	src/SeajsBundle/Seajs/Modules/BundleFileCombine.cs
	src/SeajsBundle/Seajs/Modules/SeajsModuleFactory.cs