Merge branch 'media-component' of github.com:wpbrains/bootstrap into media-component

Conflicts:
	docs/components.html
Signed-off-by: Giuliano Velli <wpbrains@giusi.org>