Actors and Content Provider updated, nothing being used just yet
Merged from master and Tank Convergence