order
Merge branch 'psuminski'
fix1
fix1
Merge branch 'master' of https://github.com/zarie/apka
Merge branch 'gapsa'

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