panel added
Merge branch 'master' of https://github.com/ajliv/selfedge-bootstrap

Conflicts:
	dist/css/bootstrap.min.css