Merge branch 'master' into develop
Adding diarchy
Adding updated styles for diarchy

Also handles smooth width transitions
Merge branch 'diarchy' into develop
Merge branch 'develop'
Version bump