Stopping Point - Area Management UI updates

Still need to fix some data after db changes
cleaning up
Revert "cleaning up"

This reverts commit bc43affb890aa645c05825f8e628983b979b9aa1.
Merge branch 'master' of https://github.com/vtb104/SWENG500

Conflicts:
	fu_temp.js
Merge remote-tracking branch 'origin/master'
Revert "Stopping Point - Area Management UI updates"

This reverts commit c95979ba295fe007f1d7bf21f969b6b24deff477.