merged with ember-model upto 07d2d1ff2a50b53bab7267eba478d4e44ea2e50f [deploy]

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>