up to date
Merge branch 'master' of github.com:shanobiz/mamba

Conflicts:
	app/views/layouts/application.html.erb
	app/views/topics/_subscription.html.erb