Merge branch 'master' into deprecate-screen-device-vars

Conflicts:
	less/variables.less

diff --cc less/variables.less
index b2547493aaa2ed6e7b2967e7a1f1fdf3af43216b,b6cd3a940c190dd5da9c1d4a8c01c44ecbc36d1f..7dff919c39626e22a1ffb72832a1d14fc3b2acc7
--- 1/less/variables.less
--- 2/less/variables.less
+++ b/less/variables.less
@@@ -200,25 -207,29 +207,33 @@@
  // --------------------------------------------------
  
  // Extra small screen / phone
 -@screen-xs:                  480px;// NOTE: Deprecated in v3.0.1 in favor of @screen-xs-min
++// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1
 +@screen-xs:                  480px;
- @screen-phone:               @screen-xs;// NOTE: Deprecated in favor of @screen-xs
+ @screen-xs-min:              @screen-xs;
+ @screen-phone:               @screen-xs-min;
  
  // Small screen / tablet
 -@screen-sm:                  768px;// NOTE: Deprecated in v3.0.1 in favor of @screen-sm-min
++// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1
 +@screen-sm:                  768px;
- @screen-tablet:              @screen-sm;// NOTE: Deprecated in favor of @screen-sm
+ @screen-sm-min:              @screen-sm;
+ @screen-tablet:              @screen-sm-min;
  
  // Medium screen / desktop
 -@screen-md:                  992px;// NOTE: Deprecated in v3.0.1 in favor of @screen-md-min
++// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1
 +@screen-md:                  992px;
- @screen-desktop:             @screen-md;// NOTE: Deprecated in favor of @screen-md
+ @screen-md-min:              @screen-md;
+ @screen-desktop:             @screen-md-min;
  
  // Large screen / wide desktop
 -@screen-lg:                  1200px;// NOTE: Deprecated in v3.0.1 in favor of @screen-lg-min
++// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1
 +@screen-lg:                  1200px;
- @screen-lg-desktop:          @screen-lg;// NOTE: Deprecated in favor of @screen-lg
+ @screen-lg-min:              @screen-lg;
+ @screen-lg-desktop:          @screen-lg-min;
  
  // So media queries don't overlap when required, provide a maximum
- @screen-xs-max:              (@screen-sm - 1);
- @screen-sm-max:              (@screen-md - 1);
- @screen-md-max:              (@screen-lg - 1);
+ @screen-xs-max:              (@screen-sm-min - 1);
+ @screen-sm-max:              (@screen-md-min - 1);
+ @screen-md-max:              (@screen-lg-min - 1);
  
  
  // Grid system