shared resources
Merge branch 'Dev' into BridgeManager
minor fix to account page
fix bugs
Merge branch 'Dev' into UI