fix for upgrades
fix for availableTechnology with trades
fix trades not disappearing
Split views into separate files
Merge branch 'master' into chat
Added chat from firebase