updated rails helper
Merge branch 'development'