manage security (ref: #632, #633)
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/views/layouts/_sidebar_menu.html.erb