auth ready
Merge branch 'r8-develop' of github.com:aelaa/ulgood into r8-develop

* 'r8-develop' of github.com:aelaa/ulgood:
  Rails 3.2.15 update