reformatted locations; finished stock entry; main stock page
merged in base.sql changes