rrr
Merge branch 'addNotification' of github.com:progracqteur/WikiPedale into addNotification

Conflicts:
	app/config/parameters.yml
Add parameters.yml to .gitignore
Add parameters.yml to .gitignore