trying some things
Merge branch 'master' into ember
slight depenancy modifications and resize additions
oops on ember again
oops conflict