modification, updates, add new user page May 21
Merge branch 'master' of https://github.com/rrebucas/payrollsystem

Conflicts:
	files/menu.html
	files/ps_xls_import.html