Switching to dev

Pulling Alexi's work to dev, since we are only two on this fucking project.
Commits will now be done on dev. Other branches will be deleted soon to leave master and dev.