updating master
merging master
small changes to js/scss and users_controller