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
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
Issue #285 add Videos gallery
Merge branch 'migrations' of https://github.com/yousraHazem/Topsoft-14 into migrations

Conflicts:
	kidzen/db/migrate/20140411102209_create_registered_user.rb
Merge branch 'migrations' into c3_s27_photos_and_videos_gallery
Issue #285 Put javascript in seperate file
Issue #285 add documentation and fix code
Revert "Merge branch 'migrations' of https://github.com/yousraHazem/Topsoft-14 into migrations"

This reverts commit 90170d001b74d3fc77d0c2353543d04eadc7ad8b, reversing
changes made to 9080c40a2c7f22a742633845d0f0a8000ce195ce.
Issue #285 fix code conventions
Revert "Issue #285 fix code conventions"

This reverts commit 7955b55154435847bfd1ac87b68a61656cae56ec.
Issue #285 fix code
Issue #285 trying to add tests