Merge branch 'phase2', remote-tracking branch 'origin' into phase2
Merge remote-tracking branch 'origin/phase2' into phase2
Merge branch 'phase2' of http://github.com/snowpuppy/augreality into phase2
Merge branch 'phase2' of http://github.com/snowpuppy/augreality into phase2
Merge remote-tracking branch 'origin/phase2' into phase2
Merge remote-tracking branch 'origin/phase2' into phase2
Merge remote-tracking branch 'origin/phase2' into phase2
Merge remote-tracking branch 'origin/phase2' into phase2
Merge remote-tracking branch 'origin/phase2' into phase2
Merge remote-tracking branch 'origin/phase2' into phase2
Merge remote-tracking branch 'origin/phase2' into phase2
fixed cliet application so it will exit if render code exits.
Merge remote-tracking branch 'origin/phase2' into phase2