index on master: b1571b2 Merge pull request #74 from opensim-org/componentTestHarness
On master: stationsStash
Added two new frame components.  Frame is the base class that handles all interesting frame-like operations.  BodyFrame is a concrete class that creates a frame at the origin of the body.  Also added to testComponents.cpp and python wrapping.
Add OVERRIDE_11 into signatures in Station ModelComponent
RegisterType and add to testComponents.cpp
Merge branch 'matt_ayman_frames' of https://github.com/opensim-org/opensim-core into matt_ayman_frames

Conflicts:
	OpenSim/Tests/Components/testComponents.cpp
Add Station to testComponents pending a decentralized test harness and comment back the memory leaking part that was causing the test to fail.
Remove unnecessary namespace qualification
Add setter of Frame Connector
Add static member variable identityTransform to Frame class to avoid returning reference to local variable in BodyFrame::getTransform()
- Added a class FixedFrame that can attach to any other frame.  It inherits the generic interface of Frame.

- Refined the generic Frame interface such that a Frame transform by default defines it relative to it's parent.  Specifically, Frame.getTransform() returns parent_X_me, such that v_in_parent = parent_X_me*v_in_me.

- bug fixes to all frames types.
Bug fixes and conflict management as described below.

Merge branch 'matt_ayman_frames' of https://github.com/opensim-org/opensim-core into matt_ayman_frames

Conflicts:
	OpenSim/Simulation/RegisterTypes_osimSimulation.cpp
Refinements to Frame and Station.  The interface to frame is smaller and simpler.  Station now has a method for reexpressing as an equivalent station in another Frame.

Also added the skeleton for testFrames.cpp
Forgot to add FixedFrame to the last commit.  Added Now.
make Frame::identityTransform protected instead of public.
Merge remote-tracking branch 'remotes/origin/master' into matt_ayman_frames

Conflicts:
	OpenSim/Simulation/osimSimulation.h
	OpenSim/Tests/Components/testComponents.cpp
Update code on this branch to be consistent with latest master, in particular:
- Manager now takes integrator reference rather than pointer as input.
- We use override rather than the macro OVERRIDE_11
No properties in Frame base class.
Add test case for testFrames and tie FixedFrame::transform to properties so that they are in sync.
Fix build warnings by returning a copy rather than a reference to local variable as reported by gcc.