add reminding stuff from master
Merge branch 'master' of github.com:Topart/new_production
Merge branch 'master' into staging