Merge branch 'master' of github.com:festiio/Festi_Server
Merge branch 'rc1.0' of github.com:festiio/Festi_Server into rc1.0