Updated the comment to use the correct parameter name
Merge pull request #304 from kryger/patch-1

Updated the comment to use the correct parameter name
Force line endings to LF
Merge branch 'master' of https://github.com/jhipster/generator-jhipster
Use standard bootstrap navbar
Fix indentation
Merge branch 'LeovR-navbar'
i18n error
Wording
More Java 8 support
Remove oauth2 references when not used
bug fix #306
Fix compilation error mongoDB+ehcache
bug fix #302
Added sample changeSet to be used for the entity sub-generator
Indention should be 4 spaces