commit this
Merge branch 'master' of https://github.com/xelakz/LeaveApp

Conflicts:
	js/views/hr/leaves.js