Group by post id to ensure that we dont get the same post returned more than once
more efficent query
Order attachments by menu_order
Add Option model
Merge branch 'master' into tests