user validations
guard and spec_helper init
merge master into user