Merge pull request #159 from 28msec/fix-master2

Fix master
Update rules to prevent collisions
Merge master
Fix build
Update test user password
Merge pull request #170 from 28msec/updatepassword

Update test user password
Update the latest version of layoutmodel-renderer-angular
Merge pull request #168 from 28msec/rule-collision

Update rules to prevent collisions
Merge pull request #171 from 28msec/updatepassword

Update the latest version of layoutmodel-renderer-angular
Handle cell collision in the spreadsheet modal
Add lodash module
Fix build
Add missing include in test
Merge pull request #172 from 28msec/updatepassword

Handle cell collision in the spreadsheet modal
Merge branch 'master' into nttdata