2 nova act
Merge branch 'master' of https://github.com/MIBIGTeam/BIGNews

Conflicts:
	AndroidManifest.xml