profile
unit tests 4 events
Merge branch 'master' of https://github.com/max-konin/Kogdata
tests 4 events
Merge remote-tracking branch 'origin/master'

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