Merge branch 'release/2014-final'
fix the issue
Merge branch 'hotfix/fix_user_order_redirection_error' into develop