updated merge conflicts

CHANGELOG.md

-## 2.13.7 (development)
+## 2.13.7
 
 
 * Updated TabsController to no longer force the default animation to change between tabs and not return to normal behavior.  
 * Updated TabsController to no longer force the default animation to change between tabs and not return to normal behavior.  
+* [issue-1044](https://github.com/CosmicMind/Material/issues/1044#issuecomment-371061101): Fixed issue where TabBar items were not correctly laying out. 
+
+>>>>>>> master
 
 
 ## 2.13.6
 ## 2.13.6
 
 

Material.podspec

 Pod::Spec.new do |s|
 Pod::Spec.new do |s|
 	s.name = 'Material'
 	s.name = 'Material'
-	s.version = '2.13.6'
+	s.version = '2.13.7'
 	s.license = 'BSD-3-Clause'
 	s.license = 'BSD-3-Clause'
 	s.summary = 'A UI/UX framework for creating beautiful applications.'
 	s.summary = 'A UI/UX framework for creating beautiful applications.'
 	s.homepage = 'http://cosmicmind.com'
 	s.homepage = 'http://cosmicmind.com'

Sources/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
 	<key>CFBundleShortVersionString</key>
-	<string>2.13.6</string>
+	<string>2.13.7</string>
 	<key>CFBundleSignature</key>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<key>CFBundleVersion</key>

Sources/iOS/TabBar.swift

@@ -358,6 +358,7 @@ fileprivate extension TabBar {
             let p = q + tabItemsInterimSpace
             let p = q + tabItemsInterimSpace
             
             
             for v in tabItems {
             for v in tabItems {
+                v.sizeToFit()
                 let x = v.sizeThatFits(CGSize(width: .greatestFiniteMagnitude, height: scrollView.bounds.height)).width
                 let x = v.sizeThatFits(CGSize(width: .greatestFiniteMagnitude, height: scrollView.bounds.height)).width
                 v.frame.size.height = scrollView.bounds.height
                 v.frame.size.height = scrollView.bounds.height
                 v.frame.size.width = x + q
                 v.frame.size.width = x + q