Order by priority and locale

Also removing test comment since we have a real comment now for sr.
Merge pull request #19 from flodolo/order2

Order by priority AND locale