fixing ordering problem in submissions
Merge branch 'kayvan/spillio2014' into heroku