from Rails3.2 to Rails4
Merge branch 'develop'