comit something

2
Merge remote-tracking branch 'origin/bootstrap3_ui' into bootstrap3_ui

Conflicts:
	src/Messages/Ornament.Messages.Plugin/Scripts/Sender/Index.js