updated logins and stock data views
merged conflicts, deleted stockadata.php