Default to localhost without anything else but the server's definition
Merge pull request #1056 from padrino/default-server-to-localhost

Default to localhost without anything else but the server's definition
Change default source in Gemfiles, use https to access rubygems.org

The source :rubygems is deprecated because HTTP requests are insecure
Merge pull request #1058 from tyabe/change_source_in_gemfile

Change default source in Gemfiles, use https to access rubygems.org
fix mailer generation to handle nested apps

in relation to #1011
Merge pull request #1060 from tyabe/fix_mailer_generation

fix mailer generation to handle nested apps
Removed dead code about admin themes and the bundle command is enough for installing new gems
Merge pull request #1065 from matthias-guenther/master

Dead code elimination and bundle command
Removed JSON rendering functionality
Execute the mysql command with separate arguments.
Merge pull request #1067 from postmodern/mysql_command

Execute the mysql command with separate arguments.
Merge pull request #1066 from Ortuna/1063-json-removal

Removed JSON rendering functionality
Pin memcached down to 1.3.7, since >= 1.4.1 fail to install.

* https://github.com/evan/memcached/issues/113
Rename seed.rb to database.rb
Check for db/migrate/*.rb before running dm:migrate:up.

* If there are no explicit migrations, run dm:auto:upgrade instead.
DRY of the html_parts and text_parts methods
Refactored with hash
Merge pull request #1071 from Ortuna/refactor-mail

DRY of the html_parts and text_parts methods
Merge pull request #1070 from postmodern/database_tasks

Database tasks
Merge pull request #1069 from postmodern/memcached_is_broken

Pin memcached down to 1.3.7, since >= 1.4.1 fail to install.