Merge branch 'master' of https://github.com/yanpeipan/giter

Conflicts:
	protected/modules/plugin/controllers/GitController.php