Merge branch 'development' into C3_S18_As_a_child_I_can_invite_users_to_my_event
adding migrations
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_S18_As_a_child_I_can_invite_users_to_my_event

Conflicts:
	kidzen/db/migrate/20140420002645_create_poll_question.rb
add events
fix conflicts