SITRACK-95 - Make it work for show_criteria as well
Merge branch 'master' into rails4
Add common_engine and qe to Gemfile