Merge branch 'prod'
backup 2014-10-06
change listview in published for optimize speed
fix tests and add filter by style