Merge regboard/master

Conflicts:
	css/layout.css
	db/regboard.sql
	includes/access_right.php
	js/core.js
	js/popup.js
	js/report_filters.js
	modules/delivery/index.php
	modules/delivery/reject.php
	modules/delivery/reject_remarks.php
	modules/delivery/view.php
	modules/inventory/add_item.php
	modules/inventory/count_sheets.php
	modules/inventory/edit_item.php
	modules/inventory/new_count_sheet.php
	modules/inventory/process_add_item.php
	modules/inventory/process_edit_item.php
	modules/reports/reports.php
	modules/request/approve.php
	modules/request/cancel.php
	modules/request/index.php
	modules/request/issue.php
	modules/request/reject.php
	modules/request/reject_remarks.php
	modules/request/view.php
	modules/users/user_groups.php
	nbproject/project.properties
Merge regboard/master

Conflicts:
	css/layout.css
	db/regboard.sql
	includes/access_right.php
	js/core.js
	js/popup.js
	js/report_filters.js
	modules/delivery/index.php
	modules/delivery/reject.php
	modules/delivery/reject_remarks.php
	modules/delivery/view.php
	modules/inventory/add_item.php
	modules/inventory/count_sheets.php
	modules/inventory/edit_item.php
	modules/inventory/new_count_sheet.php
	modules/inventory/process_add_item.php
	modules/inventory/process_edit_item.php
	modules/reports/reports.php
	modules/request/approve.php
	modules/request/cancel.php
	modules/request/index.php
	modules/request/issue.php
	modules/request/reject.php
	modules/request/reject_remarks.php
	modules/request/view.php
	modules/users/user_groups.php
	nbproject/project.properties
Merge regboard/master

Conflicts:
	css/layout.css
	db/regboard.sql
	includes/access_right.php
	js/core.js
	js/popup.js
	js/report_filters.js
	modules/delivery/index.php
	modules/delivery/reject.php
	modules/delivery/reject_remarks.php
	modules/delivery/view.php
	modules/inventory/add_item.php
	modules/inventory/count_sheets.php
	modules/inventory/edit_item.php
	modules/inventory/new_count_sheet.php
	modules/inventory/process_add_item.php
	modules/inventory/process_edit_item.php
	modules/reports/reports.php
	modules/request/approve.php
	modules/request/cancel.php
	modules/request/index.php
	modules/request/issue.php
	modules/request/reject.php
	modules/request/reject_remarks.php
	modules/request/view.php
	modules/users/user_groups.php
	nbproject/project.properties
Merge regboard/master

Conflicts:
	css/layout.css
	db/regboard.sql
	includes/access_right.php
	js/core.js
	js/popup.js
	js/report_filters.js
	modules/delivery/index.php
	modules/delivery/reject.php
	modules/delivery/reject_remarks.php
	modules/delivery/view.php
	modules/inventory/add_item.php
	modules/inventory/count_sheets.php
	modules/inventory/edit_item.php
	modules/inventory/new_count_sheet.php
	modules/inventory/process_add_item.php
	modules/inventory/process_edit_item.php
	modules/reports/reports.php
	modules/request/approve.php
	modules/request/cancel.php
	modules/request/index.php
	modules/request/issue.php
	modules/request/reject.php
	modules/request/reject_remarks.php
	modules/request/view.php
	modules/users/user_groups.php
	nbproject/project.properties
Merge cart/master

Conflicts:
	catalog/view/javascript/common.js
	system/logs/error.txt
Merge cart/master

Conflicts:
	catalog/view/javascript/common.js
	system/logs/error.txt
Merge cart/master

Conflicts:
	system/logs/error.txt
Merge cart/master

Conflicts:
	system/logs/error.txt