Made small changes
Merge branch 'tradefragment' of https://github.com/maharlikans/riskybusiness into tradefragment

Conflicts:

	RiskyBusinessProject/RiskyBusiness/src/main/res/layout/fragment_trade_screen.xml

	RiskyBusinessProject/RiskyBusiness/src/main/res/layout/fragment_trade_screen_update.xml