fixes #2097 - improve debug when `puppet master --configprint` fails
fixes #2091 Menu items disappeard
fixes #2092 - allow parens in Subnet description
refs #2097 - update test to include stderr redirect
Fixes #2095 - Only show console button if VM is running
Revert bundler changes in 73f23bf4c643637c805e4911648aea16f8a73c55
fixes #2096 New location/Org button in user-menu doesn't work on ff.
1.1RC4 released
fixes #2098 - ldap auth when using a different account for authentication was broken
bumped rails to 3.0.18 to avoid latest CVE

note that bundle update rails is required after this patch
refs #1947 - fixes typo
Added additional counter-tests to config templates
Extended information for each type of compute resources
Fixes #1884 - hardcode a version number for Debian's testing/unstable suites
fixes #2109 - improve session token security

- adds security:generate token rake task to create static token
- generate and cache a token on startup if static token isn't present

Thanks to Sandor Szücs <sandor.szuecs@fu-berlin.de>
Fixed merge conflicts