Added import users functionality, created stub for import equipment
Added import equipment functionality, fixed a couple of schema bugs