gali
Merge branch 'master' of https://github.com/natanshalva/Community-Currency

Conflicts:
	test.txt
baseline
unable to pull
Merge branch 'master' of https://github.com/natanshalva/Community-Currency
only users
Merge branch 'master' of https://github.com/natanshalva/Community-Currency
before login
unmatched versions
migration of user_products
Merge branch 'master' of https://github.com/natanshalva/Community-Currency