update docs
fix configuration of additional-providers
change merge criteria
first working version
Merge branch 'master' of git://github.com/azine/AzineHybridAuthBundle