Merge branch 'master' of https://github.com/lbarriosh/cygnus-cloud into web_development
Merge branch 'web_development' of https://github.com/lbarriosh/cygnus-cloud into web_development
Merge branch 'web_development' of https://github.com/lbarriosh/cygnus-cloud into web_development