Merge pull request #2 from jobstaier/develop

Exlcude parameters.yml into .gitignore
Merge pull request #3 from jobstaier/develop

Refactor Twgi Extension + Refactor Media Libray Upload -> Edit
Merge pull request #4 from jobstaier/develop

Locale translations bone
Merge pull request #5 from jobstaier/develop

Navigation translations
Merge pull request #6 from jobstaier/develop

User Translations
Merge pull request #7 from jobstaier/develop

Hotfix: Image Upload/Delete
Merge pull request #8 from jobstaier/develop

Hotfix: CommonMethods in SettingController
Merge pull request #9 from jobstaier/develop

CommonMethods Fix + Translations
Merge pull request #10 from jobstaier/develop

Hotfix: Generate new password path
Merge pull request #11 from jobstaier/develop

Hotfix: Mailer urls
Merge pull request #12 from jobstaier/develop

Translations into views
Merger NZOZ App
Merge branch 'develop' of https://github.com/catdesign/catmsAdmin into nzoz
Merge pull request #1 from jobstaier/nzoz

Merge NZOZ