adding puzzle model,controller and views #332
adding puzzles_helper_test
adding routes
#332 adding score history to the puzzle page
#332 creating model for puzzle score
#332 modifying puzzle controller with the score history
removed photos from the branch
removed photos from the branch
#332 adding javascript and css files of the puzzle
modifying view of the puzzle #332
#332 adding code documentations
new layout
updating
updating
koko & hamada & toto
Demo
Merge branch 'development' of https://github.com/yousraHazem/Topsoft-14 into new_Layout

Conflicts:
	kidzen/Gemfile
	kidzen/app/assets/images/bg1.jpg
	kidzen/app/assets/javascripts/application.js
	kidzen/app/assets/javascripts/chatroom.js.coffee
	kidzen/app/assets/javascripts/homes.js.coffee
	kidzen/app/assets/javascripts/surveys.js.coffee
	kidzen/app/assets/stylesheets/application.css
	kidzen/app/controllers/friendships_controller.rb
	kidzen/app/controllers/home_controller.rb
	kidzen/app/controllers/new_surveys_controller.rb
	kidzen/app/controllers/supervisors_controller.rb
	kidzen/app/models/group.rb
	kidzen/app/models/permission.rb
	kidzen/app/views/drag_and_drops/show.html.erb
	kidzen/app/views/friendships/_view_my_friends.html.erb
	kidzen/app/views/friendships/view_my_friends.html.erb
	kidzen/app/views/home/index.html.erb
	kidzen/app/views/layouts/application.html.erb
	kidzen/app/views/new_surveys/show.html.erb
	kidzen/app/views/supervisors/children_history.html.erb
	kidzen/app/views/supervisors/show.html.erb
	kidzen/app/views/topics/index.html.erb
	kidzen/config/routes.rb
	kidzen/db/migrate/20140411120431_create_friendships.rb
	kidzen/test/controllers/chat_controller_test.rb
	kidzen/test/models/puzzle_test.rb
	kidzen/test/models/survey_test.rb
adding new layout