cdn update
Merge branch 'master' of https://github.com/dianping/cat

Conflicts:
	cat-home/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java
confict fix
confict fix
Merge pull request #375 from zengwei0771/master

cdn update