Merge branch 'master' into C1_AminaZoheir_#226_PollingFramework

Conflicts:
	Idearator/app/assets/javascripts/application.js
Issue #226 Add rescue in coolster methods
Issue #226 Fix polling to repeat after timeout
Issue #226 Fix indentation
Issue #226 Add documentation
Issue #226 Set timeout to 1 min
Issue #226 Add remove_online_user in coolster_controller and coolster module
Issue #226 update coolster_app methods to remove user when offline
Issue #226 Change @@guest to hash and remove guest when offline
Issue #226 remove puts
Issue #226 Fix documentation
Issue #226 Fix documentation
Issue #226 Remove code getting users_receivers ids from models to CoolsterPusher
Issue #226 Remove testing code
Issue #226 Add get_online_user_ids method for testing CoolsterController
Issue #226 Add tests
Merge branch 'C1_AminaZoheir_#226_PollingFramework' into C1_AminaZoheir_#73_ViewNotifications

Conflicts:
	Idearator/app/assets/javascripts/application.js
	Idearator/app/models/approve_idea_in_competition_notification.rb
	Idearator/app/models/create_competition_notification.rb
	Idearator/app/models/delete_competition_notification.rb
	Idearator/app/models/disapprove_idea_in_competition_notification.rb
	Idearator/app/models/edit_competition_notification.rb
	Idearator/app/models/enter_idea_notification.rb