Added layout option for controllers
Update zh_cn.yml

modify some chinese translaction error.
Merge pull request #1215 from wayshall/patch-1

Update zh_cn.yml
Improved german translations.

Date formats fixed; no "," before an "und" as last word connector.
Merge pull request #1214 from WaYdotNET/master

Update TwitterBootstrap!
Merge pull request #1216 from thirtified/fixed-german-translations

Improved german translations.
Merge pull request #1209 from Ortuna/generator-controller-layout-option

Added layout option for controllers
Added options:
*-f(--provides)
*-p(--parent)

examples:
````
padrino generate controller main -f :html,:js
````

````
padrino generate controller main -p users
````

````
padrino generate controller main -l global -p users -f :html,:js
````
```ruby
TestPadrino::App.controllers :main, :parent => :users, :provides => [:html,:js] do
  layout :global
end
```
Merge pull request #1217 from Ortuna/finish-issue-1096

Added options:
Merge branch 'master' into all-custom-error

* master:
  Added options: *-f(--provides) *-p(--parent)
  Improved german translations.
  Update zh_cn.yml
  Added layout option for controllers

Conflicts:
	padrino-core/lib/padrino-core/locale/de.yml