omochao: [rainbowdash-network] https://git.io/vrMAC root - Merge branch 'master' of https://github.com/RedEnchilada/rainbowdash-network

Conflicts:
	extlib/Auth/OpenID/CryptUtil.php