Added History tab and will remove items from stock.
uselessCommit
Merge branch 'master' into development

Conflicts:
	.classpath