Issue #234 Fix tests as they fail with master updates
Issue #96 restored deleted line in reg controller
repair merge - incorrect variables
Merge pull request #320 from DevYah/user_profile_repair

repair merge - incorrect variables
Fix Gemfile and Gemfile.lock of apptask and Add root config.ru

That's to deploy C4 Rails app_task before attempting to deploy Idearator
Merge pull request #319 from DevYah/stream_polling_and_sidebar_scroll

Stream polling and sidebar scroll
Merge pull request #303 from DevYah/C3_MahmoudHashish_#234_fix_twitter_tests

Issue #234 Fix tests to pull up with master updates
update new idea form
update new competition form
Merge branch 'master' of https://github.com/DevYah/coolsoft-13
remove user_signed_in condition from raiting_from
Merge branch 'master' into stream_polling_and_sidebar_scroll

Conflicts:
	Idearator/app/views/users/show.html.erb
Merge branch 'stream_polling_and_sidebar_scroll' into updating_forms
remove commented code from stream.js
Merge pull request #321 from DevYah/stream_polling_and_sidebar_scroll

Layout changes
Merge pull request #322 from DevYah/updating_forms

Change layout and styling of competition and idea creation forms
Merge pull request #317 from DevYah/C2_mohammad-abdulkhaliq_#96_approve_committee_2

Issue #96, restored deleted line in registrations controller.

Send out committee approval notification.
Move UMLs to the root directory to reduce Idearator subtree size.
Merge branch 'master' of https://github.com/DevYah/coolsoft-13
Fix Gemfile and Gemfile.lock

Add gem pg to production group and move gem sqlite3 to development and test group for deployment