Select2 and angular-ui-select2 upgrade
Main js cleanup