Merge branch 'master' of http://192.168.1.12:3000/caipin/cld

# Conflicts:
#	protected/config/routes.conf.php