update
Merge pull request #146 from rockettheme/staging

update