ricochet update
Merge pull request #140 from rockettheme/staging

ricochet update