Merging "dev" with "master"

Updating the master version with the version shown during the March Demo Preview. It's a little differente because the ActionBar had been updated after the Preview