iUPB Version V2

Finally merges our dev branch into master. After this one. we move to feature branching/pull-requests ;)

//cc @MichaelWhi