Fixed file permission for smoketest 00-check-ntp.test
Merge pull request #3 from mihgen/smoketest

Fixed file permission for smoketest 00-check-ntp.test
Merge branch 'master' into release/essex-hack/master
Have the NTP barclamp look servers up by name rather than by IP.
Merge pull request #4 from VictorLowther/pull-req-master-41a55954f9

Fix the DNS and NTP smoketests to work when the admin node has a public IP address [1/6]
Merge branch 'master' into release/essex-hack/master
Merge pull request #5 from galthaus/pull-req-master-407dbb7e02

Merge essex-hack back into development. [13/26]
Update recipe to use new address helpers.
Merge pull request #7 from VictorLowther/pull-req-feature-ip-hacking-master-9e71df0fc5

Rewrite network barclamp to manage interfaces directly. [7/22]
move i18n from crowbar.yml into locale file
Merge pull request #8 from cloudedge/pull-req-release-rails3anddb-master-41f2c02b3d

Move Nav into a database and adjust imaged locationalization [5/15]
layout 2 and stub the docs
Merge pull request #9 from cloudedge/pull-req-release-rails3anddb-master-537bf1f1ad

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

migration pull requests [12/29]
Fixed problem with layout rendering due to initialize method not calling super.  Re-factored to use before_filter method to load @service_object and deleted initialize method.
Merge pull request #12 from dpaterson/pull-req-release-rails3anddb-master-c3e40f30eb

re-factor out intialize method in controllers [8/22]
Fix barclamp initialization and unix file format issues
Merge pull request #13 from galthaus/pull-req-release-rails3anddb-master-df5065c014

Tweak Daves fix for object initialization and fix some linux file format issues [12/29]
Remove unneeded code from the barclamp controllers