cleans up javascript of users controller
Merge branch 'development'