Match error response expected by ember-data.js
Fix typo.
Merge pull request #167 from abuiles/patch-2

Fix typo.
Merge pull request #166 from HeroicEric/scaffold_generator_error_response

Match error response expected by ember-data.js
New path for Rails serializers

With this change Rails serializers are going to be placed under
`config/serializers` along side with Ember ones.

Fixes #162

@bcardarella + @twokul
Merge pull request #168 from dockyard/alex-active-model-serializers

New path for Rails serializers
Update to Ember Data 1.0.0-beta.6.

This resolves an issue with the new resolver dasherizing names which
caused the _ams adapter to not be found due to the resolver dasherizing
the looked-up names.
Merge pull request #169 from rjackson/update-ember-data

Update to Ember Data 1.0.0-beta.6.
Put input inside label instead of having an empty for.

Conflicts:
	CHANGELOG.md
Merge pull request #171 from abuiles/nested-input

Put input inside label instead of having an empty for.
Add classes to generated templates.
Merge pull request #172 from abuiles/scaffold-classes

Add classes to generated templates.
Use quoted action names.

Actions can now use bound property lookup (instead of being static
strings).

This was added in https://github.com/emberjs/ember.js/pull/3936.
Merge pull request #174 from rjackson/use-quoted-actions

Use quoted action names.
fixed generators error for custam app and config path
Merge pull request #173 from stakoov/config-err

repair config path for ember generators
ember:bootstrap creates directory structure for custom --app-paths

have a consistent directory layout even when using —app-path
“my-custom-app”
update changelog
Merge pull request #177 from sbl/bootstrap-custom-paths

ember:bootstrap creates directory structure for custom --app-paths
Add syntax highlighting instructions for emacs.