fixed tags issue in baseobject
removed combined.js and added appacitivesdk.js
changed sdk refs in tests
Merge remote-tracking branch 'upstream/master'