08-04-2013

merge to review all project and fix new arshj bug