merge
Merge branch 'master' of git@github.com:ichylinux/banbanlive.git

Conflicts:
	config/initializers/secret_token.rb