updates
Merge branch 'master' of https://github.com/popupstorz/popupstorz
updates
updates
udpaets
updates
updates
updates
updates
Merge branch 'master' of https://github.com/popupstorz/popupstorz

Conflicts:
	config/locales/fr.yml