Merge branch 'develop' of github.com:joshsoftware/intranet into develop
fix the bug for id
Merge branch 'develop' of github.com:joshsoftware/intranet into develop

Conflicts:
	app/views/users/_document.html.haml
Merge branch 'develop' of github.com:joshsoftware/intranet into leave_application
added the view availability