Merge pull request #30 from tweise/master

bump master version to 0.3.5-SNAPSHOT
#45 Move SiteOps Demo to Node.js
Merge branch 'master' of github.com:DataTorrent/Malhar
#51 Ads Dimension Demo - 1 hour lookback instead of 15 minutes
#51 Ads Dimension Demo - 2 hours lookback
fix #80 Webdemos - round time to minute
fix #51 Ads Dimension Demo - 2 hours lookback
Merge remote-tracking branch 'upstream/master' into webdemos
#85 Web Demos - Architecture Documentation
fix #85 Web Demos - Architecture Documentation
Merge commit '48c230b2368ff78d361c8a931fcd5ca67371d57d'
Merge branch 'master' of https://github.com/DataTorrent/Malhar
Squashed commit of the following:

commit 7008069a8e26dcea8dab947804e22e3b82c61247
Author: nickholub <nikholub@gmail.com>
Date:   Wed Sep 25 11:21:33 2013 -0700

    fix #85 Web Demos - Architecture Documentation

commit 18fc1a196475f3e6cd353cb721eb85b3bb91d03b
Author: nickholub <nikholub@gmail.com>
Date:   Wed Sep 25 11:14:39 2013 -0700

    #85 Web Demos - Architecture Documentation

commit 7c7d6d395c9e7c8872408f2c7225e0757e67422c
Merge: 0682445 ddaed5f
Author: nickholub <nikholub@gmail.com>
Date:   Tue Sep 24 18:02:52 2013 -0700

    Merge remote-tracking branch 'upstream/master' into webdemos

commit 068244599d103bf069a76110d9763b15811aa169
Author: nickholub <nikholub@gmail.com>
Date:   Tue Sep 24 17:59:58 2013 -0700

    fix #51 Ads Dimension Demo - 2 hours lookback

commit f8df03a237be14c09df9e29b5e79527227360fea
Author: nickholub <nikholub@gmail.com>
Date:   Tue Sep 24 17:55:03 2013 -0700

    fix #80 Webdemos - round time to minute

commit e7c097991f1d3ad86153b5259c9a0084819dd054
Author: nickholub <nikholub@gmail.com>
Date:   Tue Sep 24 17:42:09 2013 -0700

    #51 Ads Dimension Demo - 2 hours lookback

commit 6582c6705d3ccebaab0ef7fc5e7c403a8df699dc
Author: nickholub <nikholub@gmail.com>
Date:   Tue Sep 24 17:38:53 2013 -0700

    #51 Ads Dimension Demo - 1 hour lookback instead of 15 minutes
fix #85 Web Demos - Architecture Documentation
fix #85 Web Demos - Architecture Documentation
merge from webdemos
Squashed commit of the following:

commit f8eef4ac12e95b05377ad6e4a1de9ef7cb9a5e41
Merge: 5414883 6709d75
Author: Ashwin Chandra Putta <ashwin@datatorrent.com>
Date:   Wed Sep 25 20:15:22 2013 -0700

    Merge branch 'logstream_upstream' into logstream

commit 54148833fbbd56dbb297faaeed5ec70602276e56
Author: Ashwin Chandra Putta <ashwin@datatorrent.com>
Date:   Wed Sep 25 20:13:37 2013 -0700

    renamed operator class as per convention

commit ad8a03e74a1c0bbb0aedf60404e7720b5926a7d7
Merge: 3bf7b58 493c28d
Author: Ashwin Chandra Putta <ashwin@datatorrent.com>
Date:   Wed Sep 25 18:53:27 2013 -0700

    Merge branch 'logstream_upstream' into logstream

commit 3bf7b58cfc5441c18bb4c5b7a08302d618fa7fd3
Author: Ashwin Chandra Putta <ashwin@datatorrent.com>
Date:   Wed Sep 25 18:23:49 2013 -0700

    added test for JsonByteArrayToHashMap operator

commit 4631eda09ac7940072a6cdff8bf083d1c963c27e
Author: Ashwin Chandra Putta <ashwin@datatorrent.com>
Date:   Wed Sep 25 13:52:37 2013 -0700

    added apache license header to new operator

commit beeb211f8946b19b849c3023b04b319584daff0b
Author: Ashwin Chandra Putta <ashwin@datatorrent.com>
Date:   Wed Sep 25 13:50:11 2013 -0700

    created pass through operator to convert json byte stream to hashmap
Merge pull request #90 from ashwinchandrap/logstream_upstream

Fixed generics usage and renamed operator classes as per convention
Merge branch 'master' of github.com:DataTorrent/Malhar
Added two output ports - outputMap, outputJsonObject

Squashed commit of the following:

commit eda9f3e68b972586f95d77290d318ad32df57903
Author: Ashwin Chandra Putta <ashwin@datatorrent.com>
Date:   Fri Sep 27 19:14:18 2013 -0700

    fixed formatting, and added test for new outputport

commit a1b97c15b19aeb7866dc0729fa5fec7ffcb68a3d
Author: Ashwin Chandra Putta <ashwin@datatorrent.com>
Date:   Fri Sep 27 18:57:35 2013 -0700

    fixed extra lines

commit d0daed93858fc9850acbd61be11849ef785a5845
Author: Ashwin Chandra Putta <ashwin@datatorrent.com>
Date:   Fri Sep 27 18:48:57 2013 -0700

    added new output port, renamed class

commit c06c60d9ddec9a51ffe93aecf8d528d14e4ae992
Author: Ashwin Chandra Putta <ashwin@datatorrent.com>
Date:   Thu Sep 26 17:52:26 2013 -0700

    changed operator to emit map<String,Object> instead of casting value to String