Merge branch 'master' of https://github.com/zarie/apka
heroku fix
Merge branch 'psuminski'
testy
false
For the lulz.
Merge branch 'master' into pablo
Paymenty naleza do eventow.
aha
view
ajaxowe usuwanie zaproszen
Merge branch 'psuminski'
redirectpoodejsciu
Merge branch 'master' of https://github.com/zarie/apka
Cos tam grzebalem...
Merge branch 'master' into pablo
wincyj ajaxa
asdasda
Merge branch 'master' of https://github.com/zarie/apka
Merge branch 'master' of https://github.com/zarie/apka into psuminski

Conflicts:
	app/views/users/show.html.haml