Merge branch 'master' into gh-pages

Conflicts:
	index.html
Merge branch 'gh-pages' of https://github.com/iadpay/iadpay.github.com into gh-pages