Update dev branch

We are fucking super heroes! 40 commits from the last dev branch update (5 days) by 3 people!