Merge branch 'hotfix/1.0.1'
Merge branch 'release/2.0rc'
Merge branch 'release/2.1rc'
Merge branch 'release/2.2'
Merge branch 'develop'
Merge branch 'release/2.4'
changes for the hot fix
bug fix for release
Merge branch 'hotfix/2.4.1' into develop
fix A

fix B

last minute feature

fix C
Merge pull request #4 from pgpbpadilla/develop

Develop
Change 1
Merge branch 'feature/ios7-support' into develop

* feature/ios7-support:
  add iOS7 support
Merge commit '89d0ae2be1b2d6200b60706efaeb680d559b95ec' into develop

* commit '89d0ae2be1b2d6200b60706efaeb680d559b95ec':
  bug fix for release
Merge commit '6d5f2c8f0c55141cf642addf172f571fed074092' into develop

* commit '6d5f2c8f0c55141cf642addf172f571fed074092':
Merge branch 'feature/featureX' into develop

* feature/featureX:
  Change 1
  fix A
Adding an amazing change