Merge branch 'migrations' of https://github.com/yousraHazem/Topsoft-14 into migrations

Conflicts:
	kidzen/db/migrate/20140411102209_create_registered_user.rb
Merge pull request #238 from yousraHazem/development

Merge sprint 1 work into master
fixed_empty_message_problem
Issue 285 add basic blueimp gallery
Revert "Issue 285 add basic blueimp gallery"

This reverts commit dad05183506af029b3aaf07d15c3871d3856a793.
Issue #285 add gallery with blueimp
trying_to_fix_display
Adding temporary post with comments
Issue #327, Adding Documentation
Issue #286 add model and draggable object
fixing conflicts to merge it
#260 fixing code according to comments
fixed recepient exist
#260 fixing documentation errors
Issue #286 Add drag and drop gameplay and submission
#260 refixing code errors
creates child history action in supervisor controller.
that gets all the children of the supervisor #268.
creates the view of children history action and the needed routes #268
Merge pull request #330 from yousraHazem/C4_S18_view_members_of_group

C4_S18_view_members_of_group
#296 pushing the first version of the code