Merge branch 'avoid_adding_invalid_conditions_when_deserializing_filter' into staging
Merge branch 'avoid_adding_invalid_conditions_when_deserializing_filter' into staging
Merge branch 'add_lps_category' into staging
Merge branch 'gross_margin_report' into staging
Merge branch 'fix_chosen_select_max_width' into staging
Merge branch 'fix_tab_for_chosen_fields' into staging
Merge branch 'chosen_search_including_whitespaces' into staging

Conflicts:
	app/assets/javascripts/shared/global.js
Merge branch 'gross_margin_report' into staging
Merge branch 'reorder_accounts_by_name' into staging
Merge branch 'gross_margin_report' into staging
Merge branch 'hours_report' into staging
Merge branch 'hours_report' into staging
Merge branch 'users_crud' into staging
Merge branch 'users_crud' into staging
Merge branch 'chosen_search_including_whitespaces' into staging
Merge branch 'chosen_search_including_whitespaces' into staging
Merge branch 'dynamic_reload_of_select_values' into staging
Merge branch 'clone_registro_de_hora' into staging
Merge branch 'dynamic_reload_of_select_values' into staging
Add Salary Adjustment creation page