Merge pull request #31 from yalmasri/master

y16 Security system classes
security

security
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/schema.rb
Merge pull request #32 from yalmasri/master

y16 Security System Classes
password reset - token null

password reset - token null
schema

schema
Merge pull request #9 from galaviz/master

L3