Merge pull request #9 from ovnicraft/master

Actualizacion desde edx/master
Merge pull request #10 from ovnicraft/master

configuracion para tema
Merge pull request #11 from ovnicraft/master

version de tema
Merge pull request #12 from ovnicraft/master

version de tema east, west
java en otro server
Merge branch 'master' of https://github.com/edx/configuration
varios
Merge pull request #14 from ovnicraft/master

pruba std theme
Merge pull request #15 from ovnicraft/master

test stanford theme
Merge branch 'master' of https://github.com/iaen-edu/configuration
Merge branch 'master' of https://github.com/edx/configuration
change platform name
Merge pull request #16 from apardo/master

change platform name
Merge branch 'master' of https://github.com/edx/configuration
Merge branch 'master' of https://github.com/iaen-edu/configuration
fix url of our repo
Merge branch 'master' of https://github.com/edx/configuration
Merge branch 'master' of https://github.com/edx/configuration
configurado para usar tema de upex
Merge pull request #17 from ovnicraft/master

configurado para usar tema de upex