Dev

I don't think we need the dev branch here, everything can be moved into the master branch
What do you think @nhaarman ?