.
user model and spec
Merge branch 'kinga'
order
events & payments
Merge branch 'psuminski'
fix1
Merge branch 'master' of https://github.com/zarie/apka
fix1
Merge branch 'master' of https://github.com/zarie/apka into psuminski
Merge branch 'master' into psuminski
Merge branch 'gapsa'

Conflicts:
	db/schema.rb
*
podishach
Merge branch 'master' into volix
Merge branch 'master' of https://github.com/zarie/apka
poprawki
Merge branch 'master' of https://github.com/zarie/apka

Conflicts:
	db/schema.rb
Merge branch 'master' into volix
schema