mergin with C4S2
Merge branch 'master' of http://github.com/ndomar/megasoft-13 into C4S2_DesignerAddGroup
tested
UML
doc
doc
css linked
docs
update to master
Merge branch 'master' of http://github.com/ndomar/megasoft-13 into C4S2_DesignerAddGroup

Conflicts:
	ClassDiagram/UMLs/C4S2_DesignerAddGroup.png
	Rails/WebsitesPrototypeBuilder/app/controllers/cardsorts_controller.rb
	Rails/WebsitesPrototypeBuilder/app/models/card.rb
	Rails/WebsitesPrototypeBuilder/app/models/group.rb
	Rails/WebsitesPrototypeBuilder/app/views/cardsorts/new.html.erb
	Rails/WebsitesPrototypeBuilder/config/routes.rb
Merge pull request #235 from ndomar/C4S2_DesignerAddGroup

C4 s2 designer add card
More updating with the master