Merge each improvement in c8 and make sure its working

[lenmorld]

• merge 1 by 1 and make sure working fine at each round
• use a "staging" branch, so master stays 99.99% working
• keep deployed stuff in Heroku updated either from staging or from master