Merge branch 'master' of github.com:IcaliaLabs/Presentr

# Conflicts:
#	CHANGELOG.md
#	README.md

CHANGELOG.md.orig

@@ -0,0 +1,46 @@
+### What's New
+
+<<<<<<< HEAD
+#### 1.0.5
+- Support for animated blurred background (thanks to @fpg1503)
+
+#### 1.0.4
+- New ModalSize option with sideMargin value (thanks to @alediaz84)
+=======
+#### 1.0.4
+- New ModalSize option with sideMargin value
+>>>>>>> d2dfc441f5c90bee280e8b4dd8db188cc9969405
+- Example project fixes
+
+#### 1.0.3
+- Support for custom radius & drop shadow (thanks @falkobuttler)
+- New fluid percentage option for ModalSize enum (thanks @mseijas)
+- Example project and other general improvements (thanks @gabrielPeart)
+
+#### 1.0.2
+- Bug Fixes
+
+#### 1.0.1
+- Added keyboard observation options for .popup (thanks @aasatt)
+- Swipe to dismiss gesture (thanks @josejuanqm)
+
+#### 1.0.0
+- Adds support for Swift 3.0, XCode 8 & iOS 10.
+- This will be the only maintained version from here on out.
+
+#### 0.2.0
+- Adds support for Swift 2.3.
+- This version will not be updated/mantained. If you need the latest features, you must use Swift 3.0.
+
+#### 0.1.8
+- .FullScreen PresentationType.
+- Ability to set animation on/off for dismissOnTap.
+
+#### 0.1.7
+- Ability to set dismiss transition type.
+- Modify background color & opacity.
+- Add blur to background.
+
+#### 0.1.6
+- Custom PresentationType's.
+- Round corners option.

README.md

@@ -36,13 +36,6 @@ This can be cumbersome, specially if you do it multiple times in your app. **Pre
 - New fluid percentage option for ModalSize enum (thanks @mseijas)
 - Example project and other general improvements (thanks @gabrielPeart)
 
-#### 1.0.2
-- Bug Fixes
-
-#### 1.0.1
-- Added keyboard observation options for .popup (thanks @aasatt)
-- Swipe to dismiss gesture (thanks @josejuanqm)
-
 #### See CHANGELOG.md for previous
 
 ## Contributing