Signed-off-by: longmon hau <1307995200@qq.com>
Merge branch 'master' of git@github.com:longmonh/kitt.git

Conflicts:
	usr/controllers/index.class.php

Signed-off-by: longmon hau <1307995200@qq.com>