rudy_update_user_page_may 23
Merge branch 'master' of https://github.com/rrebucas/payrollsystem

Conflicts:
	files/ps_list_employees.php
	files/ps_theme/css/profile.css
	files/ps_theme/images/ajax-loader.gif
import renante / 2 tables-sql
Merge branch 'master' of https://github.com/rrebucas/payrollsystem
rud_update_may24
Merge branch 'master' of https://github.com/rrebucas/payrollsystem
delete_sample image
Merge branch 'master' of https://github.com/rrebucas/payrollsystem

Conflicts:
	files/ps_admin_profile.php