Updated pod spec with a more precise description
Merge branch 'develop' for v 1.2
Update README.md
Update README.md
Fixed warning in Xcode 5.1
Fixed a crash when launching app on 7.1 simulator
Updated pod spec to v 1.2.1
Added basic custom animations
Added an iPhone example
Removed unused comment
changed the property association type to copy
Add popin alignement option and update demo
Fix for view being accessed to early
Minor refactoring for documentation
Fixed behavior difference between animated and non animated popins in viewDidLoad
Merge branch 'jonasman-master' into develop
Improved demo for custom transition
Merge branch 'feature/alignementOption' of https://github.com/leverdeterre/MaryPopin into leverdeterre-feature/alignementOption
Minor refactoring
Added documentation to new enum value
Merge branch 'leverdeterre-feature/alignementOption' into develop

Conflicts:
	MaryPopin/UIViewController+MaryPopin.h
	MaryPopin/UIViewController+MaryPopin.m
	MaryPopinDemo/MaryPopinDemo/BKTViewController.m
	MaryPopinDemo/MaryPopinDemo/en.lproj/Main_iPhone.storyboard
Fixed animation issue with frame offset
Fixed typo in a method name
Updated demo
Added appearance beginning and ending manually for view controllers which do not forward automatically. Fix #15.
Added an option to have a blurry background