Old version
Merge branch 'deploy' of github.com:carlostrianag/shiftscope_webApp into deploy