added activation_key and is_activated to user table
Merge remote-tracking branch 'origin/master'