for deploy
unicorn and some changes for deploy
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/schema.rb
google anal and change site's domain