Work on route management
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	Web Portal/Modules/GSPlatformBeacon/app/config.json
Support unit tests on controllers

Support unit tests on controllers