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
fixed recepient exist
removing nickname and permission_id from RegisteredUsers
renaming column in notifications
renaming tags to tag in keywords
creating offensive_words #324
creating posts #328
creating comments #329
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
#296 pushing the first version of the code
Issue #285 add Videos gallery
Fixed destroy group bug, fixed show view, added error reporting for groups form and added documentation for changes. #279
Merge branch 'migrations' of https://github.com/yousraHazem/Topsoft-14 into migrations

Conflicts:
	kidzen/db/migrate/20140411102209_create_registered_user.rb