removed condition in application controller
Merge branch 'master' of ssh://github.com/tommyadey/aries
fixed small issue in order.rb