checkpoint for user controller/views
Merge remote-tracking branch 'dellcloudedge/master'
Some api tweaks etc..
Some api tweaks etc..
Some api tweaks etc..
bdd user modifications
bdd user modifications
from training - add ability to use name instead of ID in bdd:scenario
WIP - cmdb spec, add factory_girl back
checkpoint
checkpoint
Merge remote-tracking branch 'dellcloudedge/master'
First draft of the proposed browser support policy

A clearly stated browser support policy makes it clear to our users what
to expect, and which browser and OS combination they should use for the
optimal experience.

It also makes it clear to developers and QA what the priorities are.
This way we can focus the limited resources on the tasks that matter
most.
Merge remote-tracking branch 'dellcloudedge/master'
simulator working to create nodes, attributes and groups.  some testing still to go
Merge remote-tracking branch 'dellcloudedge/master'
Merge remote-tracking branch 'dellcloudedge/master'
resolve merge conflict in export
stop throwing on regex fails during HTML parsing, merge Chris' change
Merge remote-tracking branch 'dellcloudedge/master'