no message
Merge branch 'master' of https://github.com/neculaiandrei/QRParty

Conflicts:
	application/configs/application.ini