bug fixed
Merge branch 'master' of https://github.com/phresco/framework

Conflicts:
	phresco-framework-impl/src/main/java/com/photon/phresco/framework/impl/SCMManagerImpl.java