user history with index page and links
Merge branch 'master' into order_history