Bringing master to dev

Bringing token cloud credentials and preliminary Windows 8 support to master.