Adding brackets to angular controller
adding parameters to controller
Merge branch 'development' into integration
Compiling assets
Merge branch 'integration'