Subo lo que llevo
	modified:   web/CygnusCloud/controllers/administrator.py
	modified:   web/CygnusCloud/controllers/administrator.py.bak
	modified:   web/CygnusCloud/controllers/main.py
	modified:   web/CygnusCloud/controllers/main.py.bak
Merge branch 'web_development' of https://github.com/lbarriosh/cygnus-cloud into web_development