MAchine UI

Add, Edit, Delete, List
Merge branch 'machinesUI'
Merge branch 'master' of https://github.com/tapandtypeahm/minex

Conflicts:
	lib/machine-functions.php