cleanup commit to master
commit unstaged changes
Merge branches 'master' and 'staging' into staging