test input glyphicon
Merge remote-tracking branch 'origin/Wireframe' into Wireframe

Conflicts:
	wireframe/BO/css/style.css