@ script: preparing to add scripts as submodule
Merge branch 'notif' into develop
@ script: preparing add script as submodule
@ script: script added as submodule
@ scripts: updated
Merge branch 'public' into notif

Conflicts:
	scripts
Merge branch 'notif' into develop