about to complete
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/mobile/tool/stock/manager/entity/EmployeePayrollDetails.java
	src/com/mobile/tool/stock/manager/handler/AdminUserRoleHandler.java
	src/com/mobile/tool/stock/manager/view/HumanResourceTab.java
	src/com/mobile/tool/stock/manager/view/StockManagerDashboard.java