merge signup
Merge branch 'sign-up'
add todo enable to signup
Merge branch 'backbone-users'

Conflicts:
	app/models/user.rb