Merge branch 'feature/menu-104' into develop

Conflicts:
	Gemfile.lock
	app/decorators/activity_decorator.rb
	app/views/layouts/web/admin/shared/_navbar.html.haml
	app/views/layouts/web/shared/_navbar.html.haml
fixes input category and union if db empty
Merge branch 'feature/backup-117' into develop

Conflicts:
	Gemfile
	Gemfile.lock
add squeel and refactoring repository menu_item
refactornig with squeel
Merge branch 'feature/squeel-113' into staging

Conflicts:
	Gemfile
	app/views/layouts/web/shared/_navbar.html.haml