added password checks to rspec
Merge branch 'master' into rspec
controllers added and hlper methods