Speaker added

Speaker definition added
Merge remote-tracking branch 'origin/master'

Conflicts:
	TeaCup.njsproj
	packages/teacups/public/controllers/teacups.js
	packages/teacups/public/views/create.html
	packages/teacups/public/views/edit.html
	packages/teacups/public/views/view.html