Tablet

Merging tablet into a more recent dev version.