activity_information
Merge branch 'master' of https://github.com/KiGniark/TradeAndGo

Conflicts:
	app/src/main/res/layout/activity_information.xml