Merge pull request #158 from easy-es/forgot-password

Forgot password
Adding submodule Innova/DirectoryBundle
Merge pull request #166 from ALouis38/plugininnova

Adding submodule Innova/DirectoryBundle
Twitter bootstrap change of git repository
Bootstrap update (change repository)
Merge pull request #170 from solispauwels/bootstrap2

Twitter bootstrap change of git repository
Merge remote-tracking branch 'upstream/master' into forgot-password
merge with master