modified:   public/javascripts/requier/Classes/Person_new.js
	modified:   public/javascripts/requier/Classes/Project.js
	modified:   public/javascripts/requier/Confirm.js
	modified:   public/javascripts/requier/Classes/Person_new.js
Merge branch 'express' of https://github.com/glebovilya/CBoard into express

Conflicts:
	public/javascripts/requier/Classes/Person_new.js
	public/javascripts/requier/drag&drop.js
	public/javascripts/requier/templates/addRemoveDate.html

	modified:   public/javascripts/main.js
	modified:   public/javascripts/requier/Classes/Person_new.js
Merge branch 'express' of https://github.com/glebovilya/CBoard into express

Conflicts:
	public/javascripts/requier/Classes/Person_new.js

	modified:   public/javascripts/requier/Classes/Person_new.js
	modified:   public/javascripts/requier/drag&drop.js