Everything is included and updated except for the grid system and new way of using the XML. At this point it is pretty much a safe to start adding and coding with this branch.