Merge branch 'development' into loadoutScreen
Added support for heavy weapon in loadout screen.
Merge branch 'loadoutScreen' into development