Merge branch 'develop'
add run magic_encoding
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop' of git://github.com/marsz/venus into develop

Conflicts:
	lib/generators/venus/init/init_generator.rb
feature-omniauth with multi providers

    * setup
    * rename config.yml.erb to setting.yml.erb
    * add configuration for devise
    * remove useless lines of erb templates
fix bug in paginate

    * kaminari_haml may be nil
    * kaminari_haml won't be 'n' or 'N' but 'false'
change run into bundle_exec in omniauth generator
Merge pull request #2 from lazywei/develop

omniauth with multi providers
add omniauth generator
remove fbauth generator
default key secret for fb localhost
Merge branch 'feature/omniauth-generator' into develop
change version