Rails & Locomotive updates
Merge branch 'development' into integration