Merge commit '7ff4fa66723aa11570498a2d1e9a6dd5c15259a9'

Conflicts:
	.gitignore
	LICENSE

.gitignore

@@ -1,7 +1,5 @@
-# OS X
-.DS_Store
-
 # Xcode
+#
 build/
 *.pbxuser
 !default.pbxuser
@@ -13,21 +11,16 @@ build/
 !default.perspectivev3
 xcuserdata
 *.xccheckout
-profile
 *.moved-aside
 DerivedData
 *.hmap
 *.ipa
+*.xcuserstate
 
-# Bundler
+# CocoaPods
-.bundle
+#
-
-Carthage
 # We recommend against adding the Pods directory to your .gitignore. However
 # you should judge for yourself, the pros and cons are mentioned at:
 # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
 #
-# Note: if you ignore the Pods directory, make sure to uncomment
-# `pod install` in .travis.yml
-#
 #Pods/