fix
Merge branch 'master' of https://github.com/mdrobnych/fit into user

Conflicts:
	db/schema.rb
add login
Merge branch 'master' of https://github.com/mdrobnych/fit into user