Adding logo to composite
Merge branch 'master' of https://github.com/yomoments/yomoments-mob

* 'master' of https://github.com/yomoments/yomoments-mob:
  fixed typo

Conflicts:
	app/views/composite.html