add the active tab coffee file. modified the assign_leave method in user controller.
Merge branch 'master' of github.com:joshsoftware/intranet
Merge branch 'master' of github.com:joshsoftware/intranet
add the authorization for controller action.
add the athorization for controller. finished the destroy leave functionality.
remove the show link from edit page.
resolve the edit page conflict.