Merge pull request #2 from TUD-KP-WebCall/development

Provide basic setup for client development on master branch so that the test system will be updated.
Merge pull request #3 from TUD-KP-WebCall/development

Basic WebRTC implementation as Sprint Result for Sprint 01
Push-test Anton
removed test file
[WEB-24]

– relationships added to model
– migration file added
Merge pull request #4 from TUD-KP-WebCall/development

WEB-18 Conference with at least two participants
Merge branch 'master' into development
no message
temporal change
add method read data from meeting_users table
new feature: authentication system
1, add function for creating ticket of users to identify the unique user.

2, adjust the UI layout.
filter the existing user in system.
Merge branch 'development' of github.com:TUD-KP-WebCall/WebCall into development
Meetings and users connected to indicate which user is organizer of a meeting
NEW REQUIREMENTS
Users are not to be connected to meetings. Links to meetings are distributed via invitation Mail, Jabber etc.

– recreated model for Meeting and User to meet the new requirements
– WEB-34, WEB-25, WEB-35
Merge branch 'WebCall23' of github.com:TUD-KP-WebCall/WebCall into webacll23

Conflicts:
	app/models/user.rb
	app/views/users/_form.html.erb
	app/views/users/index.html.erb
	app/views/users/show.html.erb
	db/migrate/20130518150627_create_users.rb
	db/schema.rb
finished merge. project now running again.