Merge branch 'release/2.5.0' into develop
Merge branch 'hotfix/2.5.1' into develop
Update example
New default help formatter

Squashed commit of the following:

commit 201c9c4dee7474fe21d831948f83c052b17bb6f3
Author: Alexander Surma <surma@surmair.de>
Date:   Tue Feb 26 09:21:01 2013 +0100

    Fix test

commit 2c5e72c7c2d93abe0045aa6fa31f981ce04d76a0
Author: Alexander Surma <surma@surmair.de>
Date:   Mon Feb 25 19:49:33 2013 +0100

    Test does not work with new formatter
Update README
Version bump
Update CHANGELOG
Merge branch 'release/2.5.2'