added tmproj
Merge branch 'master' of ratchet.model3.net:/Users/glen/storage/git-repos/agentui
Merge pull request #1 from leithaus/master

Updates for Data Dealer demo
initialize the sessionURI in the base class
filter out blank lines and comment lines
Merge branch 'master' of ratchet:/Users/glen/storage/git-repos/agentui
-new user comp was not showing the login in certain cases
-labelsAsStrings now returns an array
-protocol handler modified to respect that we're not return an array
Merge branch 'master' of ratchet.model3.net:/Users/glen/storage/git-repos/agentui
added unit test framework
Merge branch 'origin/master'
set the SessionURI in constructor
ignore runner.js
add the NewAliasCOmp, added some more messages
Merge branch 'master' of ratchet.model3.net:/Users/glen/storage/git-repos/agentui

Conflicts:
	client/js/AgentUi.js
Added Dialog Manager
fixed name
got addAlias working
Merge branch 'master' of ratchet.model3.net:/Users/glen/storage/git-repos/agentui

Conflicts:
	client/js/AgentUi.js
tried to fix post, working on fixing the label tree
:)