fixed merge conflicts
Merge branch 'master' of https://github.com/phoenixbox/sonofstore_engine
merged Kareems branch
styling admin dash
merge conflicts
ability for user to add admin or stocker, emails still need to be set up
super user dashboard styles and js
fixed merge conflicts between master and admin styles
Merge remote-tracking branch 'origin/admin_invite' into admin_styles