Commit at office
Commit at office
Commit at office
Merge branch 'master' of https://github.com/CronutJun/NICE

Conflicts:
	nibs_msg_broker/target/.gitignore