Fix my account page because of has_spree_role bug
Merge branch 'develop'