add caja
Merge pull request #58 from xudafeng/master

Auto merge by kpm server