2.0 merge browser

I'd really like someone who knows Maven well to take a look at the last commit.