downgrade from rails 4 to rails 3
Merge branch 'develop'