Added grid and selections.
Merge branch 'refs/heads/develop' into grid-and-selections
Removed importing common defines and macros using the pch.
Merge branch 'refs/heads/master' into grid-and-selections
Fixed bug with toolbar theming.
Fixed import issue with macros.