no message
Solved conflicts
Merge branch 'master' of https://github.com/MIBIGTeam/BIGNews