Andrew Cantino: cca78da090 Merge branch 'master' into scenarios 11 gadi atpakaļ
..
assets 827b62356a the import process now allows you to merge your agents with the incoming ones; next step is better UI 11 gadi atpakaļ
concerns 64564eb120 Importing of Scenarios now works, creating any needed Agents by global guid 11 gadi atpakaļ
controllers cd5c7060fb integrate dsander's suggestions 11 gadi atpakaļ
helpers b91faf62a0 easier removal of agents from scenarios via the menu 11 gadi atpakaļ
mailers 7877ba23d4 Better email formatting for events 11 gadi atpakaļ
models cca78da090 Merge branch 'master' into scenarios 11 gadi atpakaļ
views a43d6eae97 Merge remote-tracking branch 'origin/master' into scenarios 11 gadi atpakaļ