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

Conflicts:
	kidzen/db/migrate/20140411102209_create_registered_user.rb
Issue 285 add basic blueimp gallery
Revert "Issue 285 add basic blueimp gallery"

This reverts commit dad05183506af029b3aaf07d15c3871d3856a793.
Issue #285 add gallery with blueimp
Adding temporary post with comments
Issue #327, Adding Documentation
Issue #286 add model and draggable object
Issue #286 Add drag and drop gameplay and submission
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
Issue #285 add Videos gallery
Issue #286 Track user Score
Merge branch 'Temporary_Post' into c4_s26_drag_and_drop_game
Merge branch 'migrations' of https://github.com/yousraHazem/Topsoft-14 into migrations

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