working on project allocation
Merge branch 'master' into develop
Merge branch 'develop' into allocation_management
added allocate page
fixed
resolved conflict
Merge branch 'develop_test' into allocation_management
fixed
Merge branch 'user_registration' into develop_test
Merge branch 'allocation_management' into develop_test
fixed issues
fixed js code
conflict resolved after pulling the code