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

Conflicts:
	kidzen/db/migrate/20140411102209_create_registered_user.rb
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
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