conflict resolved
Merge branch 'development' of github.com:bashantad/Industry-project into development
login Page implemented
resource restriction for device type
conflict resolved
fixed duplicate table names