Change Karma Exchange logo
Merge branch 'master' of ssh://github.com/karma-exchange-org/karma-exchange

Conflicts:
	src/main/webapp/css/app-bootstrap-cust.css

Resolved conflict