altered the messaging to reflect the suggestions given.
Revert "Moved async_aware into the models"

This reverts commit 55b8271886664b88eea00d4303507ee8f83396e5.

Conflicts:
	console/app/controllers/applications_controller.rb
	console/app/models/application.rb
Bug 908607 - Make application overview page faster
Bug 908546 - Disallow injected cart values
Merge pull request #1290 from Coolhand/dev/niharvey/bug/903733

Merged by openshift-bot
bz910577 - recheck on race condition, consumed_gear is check is optional
Properly deserialize nested cartridges when a relation exists and no method setter
Remove test case usage of Object#extend
Merge pull request #1361 from smarterclayton/bug_908607_fix_app_overview_in_devenv

Merged by openshift-bot
Merge pull request #1369 from danmcp/master

Merged by openshift-bot
Merge pull request #1370 from rajatchopra/master

Merged by openshift-bot
Merge pull request #1368 from smarterclayton/bug_908546_restrict_cart_types

Merged by openshift-bot
Merge pull request #1372 from smarterclayton/bug_907647_remove_calls_to_extend

Merged by openshift-bot
correction in node selection algorithm