Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
apply controller change
Merge branch 'develop' of https://github.com/bhavikm/adshell-prototype
login system works with database
login is permanent with session variables, header knows if user is logged in persistently and has account home link
header nav light purple back, customer and employee nav on left and also have light purple theme
apply resets session at start
Merge branch 'master' into develop