changed from email
Merge branch 'sabar'
Merge branch 'master' of github.com:sabard/headlok_rails into sabar