creating a new branch
Merge branch 'master' into lite

Conflicts:
	.project
	ajax/data.php
	classes/autoload.php
	css/main.css
Updated data.php
Finalized working on Settings and inventory management