Merge branch 'master' of https://github.com/CruGlobal/mpdx into recurring-recommendations

- Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
- updated from master
 - and specs