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
Issue 43, add photo parameter to an event in event controller
Issue 43, add photo description and upload labels in event form
trying_to_fix_display
Issue #286 add model and draggable object
fixing conflicts to merge it
#260 fixing code according to comments
Added Homepage for the website&editing in the layout #287
fixed recepient exist
#260 fixing documentation errors
Issue #286 Add drag and drop gameplay and submission
removing nickname and permission_id from RegisteredUsers
renaming column in notifications
#260 refixing code errors
renaming tags to tag in keywords