add free points to users
Merge branch 'develop' into feature/free-points

Conflicts:
	db/schema.rb
add pree poins info to user profile
Merge branch 'feature/free-points' into develop