Merge pull request #4 from VictorLowther/pull-req-release-essex-hack-master-18455684c7

Pull changes from development into essex-hack [5/16]
Merge pull request #5 from galthaus/pull-req-master-2baf710782

Merge essex-hack back into development. [5/26]
Update to CDH4 repositories
All packages we need are pulled in by the clouderamanager barclamp.
Added clouderamanager-edgenode to the role search list.
Merge pull request #6 from Paul-Webster/pull-req-release-fred-master-e43192119c

Added clouderamanager edge node to the role search. [1/3]
Merge pull request #7 from galthaus/pull-req-master-0654e5a35e

Merge fred into development again [3/15]
Move out locale stuff.
Merge pull request #8 from galthaus/pull-req-release-rails3anddb-master-d9ac3e8e10

More locale and nav changes [5/18]
layout 2 and doc stubs
Merge pull request #9 from cloudedge/pull-req-release-rails3anddb-master-a30ee7b16c

Move the crowbar.yml layout to v2 [8/27]
Add migration for importing the barclamp
Merge pull request #12 from galthaus/pull-req-release-rails3anddb-master-f0c93ccb6f

migration pull requests [8/29]
Fix barclamp initialization and unix file format issues
Merge pull request #13 from galthaus/pull-req-release-rails3anddb-master-cd702aeffb

Tweak Daves fix for object initialization and fix some linux file format issues [8/29]
Remove unneeded code from the barclamp controllers
Merge pull request #14 from galthaus/pull-req-release-rails3anddb-master-f833ca3576

More updates puma support controller cleanup [7/27]
Convert routines over to new database methods
Merge pull request #15 from galthaus/pull-req-release-rails3anddb-master-8c5c5baf7b

Switch over to new objects compute nodes almost work rename needs some help [8/29]
Merge pull request #16 from galthaus/pull-req-master-87ee69cf4b

Merge rails3anddb into development [5/29]