Fix positioning for text and image layers.
Merge branch 'paragraph_layers', fix merge conflicts.

Conflicts:
	app/view_objects/flms/keyframe_view_object.rb
Merge pull request #41 from dhawt/fix_scaled_positioning

Fix positioning for text and image layers.
Merge remote-tracking branch 'upstream/master'

his merge is necessary,
Minor cleanups in specs
Merge branch 'master' into paragraph_layers