ajax
Merge branch 'psuminski'

Conflicts:
	app/views/users/_user.haml
Merge branch 'master' of https://github.com/zarie/apka
ajax w paneu admina
Merge branch 'master' of https://github.com/zarie/apka
Merge branch 'psuminski'