fix notifications bug
Merge remote-tracking branch 'origin/master'
fix parameters
notification settings - on\off all
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Intranet/MainBundle/Controller/UserController.php
fix bug with notification on email
registration layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Intranet/MainBundle/Controller/UserController.php
fix after marging
Merge remote-tracking branch 'origin/master'
database folder