Payment flow (most of it)
Merge branch 'gh-pages' of https://github.com/LuvLDN/potential-octo-hipster into gh-pages

Conflicts:
	js/services/elasticsearch.js