Merge branch 'master' into statistics

Conflicts:
	README.md
	config/initializers/devise.rb
	config/initializers/secret_token.rb
adds popularity (top/flop) stats