Merge branch 'dt-0.9.3' into my_master
WEB-49 #fixes Dump Tweets in database on node6.morado.com
Merge branch 'master' into my_master

Conflicts:
	contrib/pom.xml
	demos/pom.xml
	demos/src/main/java/com/datatorrent/demos/twitter/JDBCOutputOperator.java
	demos/src/main/java/com/datatorrent/demos/twitter/TwitterDumpApplication.java
	demos/src/test/java/com/datatorrent/demos/twitter/TwitterDumpApplicationTest.java
MLHR-780 #resolve Moved 2 codecs form API to library
Squashed commit of the following:

commit a760df6f84a7af3e6f16db3368cfebf6babb72cc
Author: RashmiDR <rashmi@datatorrent.com>
Date:   Mon Feb 24 14:58:27 2014 -0800

    demos for benchmarking HDFS operators, fixes #MLHR-825
MLHR-826 #resolve
Merge pull request #732 from andyperlitch/depjar_err.MLHR-826

MLHR-826 #resolve
Merge pull request #731 from RashmiDR/hdfsPerformanceApps_pull

Squashed commit of the following:
Squashed commit of the following:

commit b4a80b6bad5a13386712153e94db7d230bc97de6
Author: RashmiDR <rashmi@datatorrent.com>
Date:   Tue Feb 25 13:03:56 2014 -0800

    optimizing RandomWordGenerator to improve performance, fixes #MLHR-830
Merge pull request #733 from RashmiDR/RandomWordGeneratorOptimization_pull

Squashed commit of the following:
MLHR-800 #resolve #comment data map should be cleared after emit the
data
Merge pull request #735 from siyuanh/master

MLHR-800 #resolve #comment data map should be cleared after emit the data
Fixing front build script
MLHR-849 #resolve #comment Adding exit with result of npm install and notes
Updatingto 0.9.3 release
Squashed commit of the following:

commit 1e92e41c5d6addaf27a04ba29a6c79693dad0c80
Merge: 3a2bc98 2f562f4
Author: Nick Holub <nikholub@gmail.com>
Date:   Mon Mar 3 14:06:38 2014 -0800

    Merge branch 'master' of https://github.com/DataTorrent/Malhar into installer_pull

commit 3a2bc986e3762276208b6a156c576b52b2f04061
Author: Nick Holub <nikholub@gmail.com>
Date:   Mon Mar 3 12:53:22 2014 -0800

    fix #MLHR-819 Installer - System Properties Section

commit 7c9cd8a5030e07a4ec9db9310093ebc5328d4b48
Author: Nick Holub <nikholub@gmail.com>
Date:   Mon Mar 3 12:39:53 2014 -0800

    fix #MLHR-819 Installer - System Properties Section

commit b3ee82ab3ed15b4cec331c01d6650b8b98f82874
Author: Nick Holub <nikholub@gmail.com>
Date:   Mon Mar 3 12:37:07 2014 -0800

    fix #MLHR-819 Installer - System Properties Section

commit eb84b8a26fac405964eca4773e726ef2ddcf5666
Author: Nick Holub <nikholub@gmail.com>
Date:   Sun Mar 2 20:02:46 2014 -0800

    fix #MLHR-819 Installer - System Properties Section

commit 617ffaa3a929cf0e9a2b1717ebadb79bcf4a7454
Author: Nick Holub <nikholub@gmail.com>
Date:   Sun Mar 2 12:00:25 2014 -0800

    fix #MLHR-819 Installer - System Properties Section

commit 3113d1d60403676c3a1b5903da78e41123280ed0
Author: Nick Holub <nikholub@gmail.com>
Date:   Sun Mar 2 11:54:38 2014 -0800

    fix #MLHR-819 Installer - System Properties Section

commit 73aeab64028cbc9d70e2e1eed78c570573a1303d
Author: Nick Holub <nikholub@gmail.com>
Date:   Fri Feb 28 18:12:38 2014 -0800

    fix #MLHR-819 Installer - System Properties Section

commit c9ed8305c0316e72cd88d1955f10d34b0d708f6a
Author: Nick Holub <nikholub@gmail.com>
Date:   Fri Feb 28 17:09:21 2014 -0800

    fix #MLHR-819 Installer - System Properties Section

commit 5bc557a1277677bc0d2d6e5a6e7b3358887efbef
Author: Nick Holub <nikholub@gmail.com>
Date:   Fri Feb 28 15:53:58 2014 -0800

    fix #MLHR-819 Installer - System Properties Section

commit 69735d9daa62989973108b03973ee0909683b917
Author: Nick Holub <nikholub@gmail.com>
Date:   Fri Feb 28 15:43:29 2014 -0800

    fix #MLHR-819 Installer - System Properties Section

commit 6545aaec28a1f1882dee9a5a424a8289af582036
Author: Nick Holub <nikholub@gmail.com>
Date:   Fri Feb 28 15:42:58 2014 -0800

    fix #MLHR-819 Installer - System Properties Section

commit cd839459cbd9644c8fce51647edbd678174eeb2e
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 27 23:48:00 2014 -0800

    fix #MLHR-819 Installer - System Properties Section

commit 9b72366aa5cd06eb0ad7ad8f05437ff171086b9e
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 27 14:04:23 2014 -0800

    fix #MLHR-819 Installer - System Properties Section

commit 310f0ebbb7c00a479b38a4221001b3b9b6e41b2f
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 27 11:55:27 2014 -0800

    fix #MLHR-834 - Installer - License - Registration

commit b2a1dfc8b5854043b2801df330b20e0caf113a27
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 27 11:53:16 2014 -0800

    fix #MLHR-834 - Installer - License - Registration

commit c8bf4b703535e44061768bc812399929527a81eb
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 27 11:51:30 2014 -0800

    fix #MLHR-834 - Installer - License - Registration

commit 1813454f1f0bc6d29b129d8431aa8e50e1222a6b
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 27 11:50:28 2014 -0800

    fix #MLHR-834 - Installer - License - Registration

commit 6071b61f56573e84eb92bbcb01bccdd39e84fafb
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 27 11:42:36 2014 -0800

    fix #MLHR-834 - Installer - License - Registration

commit 7939625be8a5706750437d2088567ec77bb97d44
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 27 11:27:02 2014 -0800

    fix #MLHR-834 - Installer - License - Registration

commit 2ec8d8aeccbbee699211069cbac6e547cc536d3b
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 27 11:25:26 2014 -0800

    fix #MLHR -831 Installer - License Flow

commit 62995a78b870dafed853df9277675abafbd4b9bb
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 27 11:21:55 2014 -0800

    fix #MLHR -831 Installer - License Flow

commit 1657234f96a1d124079429f9b169590d514a210d
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 27 11:17:22 2014 -0800

    fix #MLHR -831 Installer - License Flow

commit 883013f97a3d793bc7e3999f9b367dc5a618868e
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 27 11:15:56 2014 -0800

    MLHR -818 Installer - License Section

commit 5ba2a86d306b036d9cd62ab078cedff0fd728250
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 27 11:10:56 2014 -0800

    fix #MLHR-834 - Installer - License - Registration

commit 629aa127421cb1758d004d82c80cf6e047c0f056
Author: Nick Holub <nikholub@gmail.com>
Date:   Wed Feb 26 17:36:09 2014 -0800

    fix #MLHR-834 - Installer - License - Registration

commit 5850f1d65d9854938fa67dbd45b628957f5d4cb1
Author: Nick Holub <nikholub@gmail.com>
Date:   Wed Feb 26 17:31:59 2014 -0800

    fix #MLHR -831 Installer - License Flow

commit 91d2cb4fbb09c3387766abf4d62d39ad698d0826
Author: Nick Holub <nikholub@gmail.com>
Date:   Wed Feb 26 17:27:30 2014 -0800

    fix #MLHR-834 - Installer - License - Registration

commit b45b7761b982951148133c766793928bc9882883
Author: Nick Holub <nikholub@gmail.com>
Date:   Wed Feb 26 17:22:10 2014 -0800

    fix #MLHR-834 - Installer - License - Registration

commit ed8ea37daf75e2b03e3fcf4d9d7d6fe391b94d1b
Author: Nick Holub <nikholub@gmail.com>
Date:   Wed Feb 26 17:17:46 2014 -0800

    fix #MLHR-834 - Installer - License - Registration

commit 6355a80c5c44c4133adaf31836fa519953b5e678
Author: Nick Holub <nikholub@gmail.com>
Date:   Wed Feb 26 16:57:43 2014 -0800

    fix #MLHR-834 - Installer - License - Registration

commit 33081a82bb3633210a0a32373bfc42ec5385758e
Author: Nick Holub <nikholub@gmail.com>
Date:   Wed Feb 26 15:47:08 2014 -0800

    fix #MLHR-834 - Installer - License - Registration

commit f24ef3e1941475304499b93eecb9b2bd3821ae20
Author: Nick Holub <nikholub@gmail.com>
Date:   Wed Feb 26 15:38:44 2014 -0800

    fix #MLHR -831 Installer - License Flow

commit 79608297321e9bdedca0570c1a4e160ce5fcf819
Author: Nick Holub <nikholub@gmail.com>
Date:   Wed Feb 26 15:10:27 2014 -0800

    fix #MLHR -831 Installer - License Flow

commit 8f3d9d1c6b6ee6b03da3f3c98f26f2a2d7e24304
Author: Nick Holub <nikholub@gmail.com>
Date:   Wed Feb 26 15:09:59 2014 -0800

    fix #MLHR -831 Installer - License Flow

commit e033075ad1a22259d068d6ba3214d4c9d9f579e2
Author: Nick Holub <nikholub@gmail.com>
Date:   Wed Feb 26 14:03:42 2014 -0800

    fix #MLHR-834 - Installer - License - Registration

commit 54be6f71569f68f947364b050531fa456cbe7783
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Wed Feb 26 14:00:59 2014 -0800

    broke out getElement methods

commit 325974dd0afdfb375d8e48a6e4ad3880a3e6ca97
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Wed Feb 26 13:53:17 2014 -0800

    remove error message when valid

commit dda7a78491acb6e7705943850df8c3ce94b80456
Author: Nick Holub <nikholub@gmail.com>
Date:   Wed Feb 26 12:01:30 2014 -0800

    fix #MLHR -831 Installer - License Flow

commit 12d6dd7ea0f3fd617d4319eecd17f64feb0eaafb
Author: Nick Holub <nikholub@gmail.com>
Date:   Wed Feb 26 11:41:54 2014 -0800

    fix #MLHR -831 Installer - License Flow

commit 3604a259cb6b5cd5d7a83fa14dcfa1bddf744657
Author: Nick Holub <nikholub@gmail.com>
Date:   Wed Feb 26 11:22:38 2014 -0800

    fix #MLHR -831 Installer - License Flow

commit 6189744aac6bc00a3bd9904db73efb6c4938e894
Author: Nick Holub <nikholub@gmail.com>
Date:   Wed Feb 26 11:20:38 2014 -0800

    fix #MLHR -831 Installer - License Flow

commit 87651d57060990316dff31628f8fe8254126d7ff
Author: Nick Holub <nikholub@gmail.com>
Date:   Wed Feb 26 11:17:59 2014 -0800

    fix #MLHR -831 Installer - License Flow

commit db16a6bae0e9e7ff7887dc45b13783cad10ab292
Author: Nick Holub <nikholub@gmail.com>
Date:   Wed Feb 26 11:09:54 2014 -0800

    fix #MLHR -831 Installer - License Flow

commit 41ee3a1bbf33497ba6996abbef10ef9dc60348fe
Author: Nick Holub <nikholub@gmail.com>
Date:   Wed Feb 26 11:08:08 2014 -0800

    fix #MLHR -831 Installer - License Flow

commit 293475c08000f249d4828a7e0b1be58150731489
Author: Nick Holub <nikholub@gmail.com>
Date:   Tue Feb 25 16:56:00 2014 -0800

    MLHR -831 Installer - License Flow

commit 7a0e82889e84d2033f446331da7727d4cbaae889
Author: Nick Holub <nikholub@gmail.com>
Date:   Tue Feb 25 15:36:12 2014 -0800

    MLHR -831 Installer - License Flow

commit a5302b71ad739c18feb4271518dc8b68d9d9ccf8
Author: Nick Holub <nikholub@gmail.com>
Date:   Tue Feb 25 14:51:40 2014 -0800

    MLHR -831 Installer - License Flow

commit 145d8c58c4a5702c9d447576124ba64a69468360
Merge: 6c793f4 e2f3843
Author: Nick Holub <nikholub@gmail.com>
Date:   Mon Feb 24 15:25:56 2014 -0800

    Merge branch 'config' of https://github.com/nickholub/Malhar into config

commit e2f3843d3073bba1c665833cb49bcf014cad1d39
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Mon Feb 24 15:12:25 2014 -0800

    added errorEl option to bbind

commit 6c793f4a86252322e49e18ef31e54aca9b86d405
Author: Nick Holub <nikholub@gmail.com>
Date:   Mon Feb 24 12:28:06 2014 -0800

    MLHR -818 Installer - License Section

commit 59adbf32aaa93fae558f993d0233f3af059dcbc7
Merge: 06618d1 802c9cd
Author: Nick Holub <nikholub@gmail.com>
Date:   Mon Feb 24 12:04:45 2014 -0800

    Merge branch 'config' of https://github.com/nickholub/Malhar into config

commit 802c9cdd374976c1d155dce5c320238360c4643a
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Mon Feb 24 11:25:07 2014 -0800

    added error handling to upload view

commit 06618d177819f0e361515706c9d7fb306d8326cf
Author: Nick Holub <nikholub@gmail.com>
Date:   Mon Feb 24 10:33:36 2014 -0800

    daemon -> Gateway

commit 808cd6e563a795ae2be276ec47bca83c65d6a87a
Author: Nick Holub <nikholub@gmail.com>
Date:   Mon Feb 24 00:04:50 2014 -0800

    MLHR -819 Installer - System Properties Section

commit 603e2e2d5813f941b5d37ac6373eb0ec8f48d4be
Author: Nick Holub <nikholub@gmail.com>
Date:   Mon Feb 24 00:01:06 2014 -0800

    MLHR -819 Installer - System Properties Section

commit 550304ee00d9f1685a8b24d9977b7b33d1207274
Author: Nick Holub <nikholub@gmail.com>
Date:   Sun Feb 23 23:29:29 2014 -0800

    MLHR -819 Installer - System Properties Section

commit d0adffa86e2c93a42ceae9f6f45a138ed50523d4
Author: Nick Holub <nikholub@gmail.com>
Date:   Sat Feb 22 15:02:36 2014 -0800

    MLHR -818 Installer - License Section - License File Upload

commit ae7c8be5bbacc22175bdd518f4128634e3451c21
Author: Nick Holub <nikholub@gmail.com>
Date:   Sat Feb 22 14:15:18 2014 -0800

    MLHR -818 Installer - License Section - Registration

commit 9dd0265935e29606146889ebf20134860e156726
Author: Nick Holub <nikholub@gmail.com>
Date:   Sat Feb 22 14:07:19 2014 -0800

    MLHR -818 Installer - License Section - Registration

commit e9470741a5d20103282158ed449ebafeac0395af
Author: Nick Holub <nikholub@gmail.com>
Date:   Sat Feb 22 11:53:53 2014 -0800

    MLHR -818 Installer - License Section - Countries List

commit 2112ea5949910b51e895255e7f540bc2e311b435
Author: Nick Holub <nikholub@gmail.com>
Date:   Fri Feb 21 21:59:13 2014 -0800

    MLHR -818 Installer - License Section

commit 0d56fc5d467a7c448f9534887c9846d747419517
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Fri Feb 21 21:31:04 2014 -0800

    parameterized http method for file upload

commit 64fe1b392bd24dfbd99af899fc548cc290b8d3af
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Fri Feb 21 21:30:46 2014 -0800

    fixed comments, changed to not allow multiple license files

commit 09dbb41e001db630d01852a0e904421e9903dd7e
Author: Nick Holub <nikholub@gmail.com>
Date:   Fri Feb 21 16:59:16 2014 -0800

    MLHR -818 Installer - License Section

commit a7628f14c9d9a90a77bbb684b1e2cfe5e05e7cfc
Author: Nick Holub <nikholub@gmail.com>
Date:   Fri Feb 21 15:51:43 2014 -0800

    MLHR -818 Installer - License Section

commit 1339e177c2c50db033e25db5892d735e80ad8e68
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 20 21:32:42 2014 -0800

    MLHR -818 Installer - License Section

commit 2514883c8daf74041ee16abe60437442dd7e8d74
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 20 17:04:33 2014 -0800

    MLHR -818 Installer - License Section

commit f40bcfe845c87ee35ad5293de9767a82ce6e7340
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 20 16:49:53 2014 -0800

    MLHR -818 Installer - License Section

commit c9380a8773ad37047576a67ee82ecdbddcdf0225
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 20 16:42:39 2014 -0800

    WebSocket URL

commit a0470770a064d930fcc15116e4ba0f6ec8c57eb4
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 20 16:36:47 2014 -0800

    MLHR -818 Installer - License Section

commit bad7b4d9ae5d2f711acd98fe4c8ff5d68cf6250a
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 20 16:36:35 2014 -0800

    MLHR -818 Installer - License Section

commit e4e2df22f568dccdbfa35887b5ab00b15534ccf3
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 20 12:37:43 2014 -0800

    MLHR -818 Installer - License Section

commit dfaad0b21ce16e8393e53d64b02de2cd916391f9
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 20 12:36:39 2014 -0800

    fix #MLHR -820 Console - Node.js Dev Mode

commit 3fe980276d0c724a56bb55c8e17c1613097d3cc3
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 20 11:58:50 2014 -0800

    MLHR -818 Installer - License Section

commit 3933226615d03f9212b04f54b6fadf2abee3d971
Merge: e59522f 64d8014
Author: Nick Holub <nikholub@gmail.com>
Date:   Thu Feb 20 11:36:12 2014 -0800

    Merge branch 'console_config' of git://github.com/andyperlitch/Malhar into config

commit 64d8014f108f938f6f38e5a49413d4574d030eec
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Thu Feb 20 11:34:55 2014 -0800

    added LicenseStepView, a few fixes to welcome widget and StepView

commit bd29012e6d9216cd6971dd36f39d1f95f69152af
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Thu Feb 20 11:27:45 2014 -0800

    add stepViews

commit dfbaf779fc392e86b2ec90c3750e4c9ed335a818
Merge: 13b17ea e997888
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Thu Feb 20 10:54:13 2014 -0800

    Merge branch 'master' into console_config

    Conflicts:
    	front/test/suite.js

commit e59522ff1fe231fb64f9cbb7397fa7a319ab9892
Author: Nick Holub <nikholub@gmail.com>
Date:   Wed Feb 19 19:46:08 2014 -0800

    #MLHR-803 Installer (Wizard) Page

commit 607cc7f8c616cdcc3a95baa1b457824ae77499ac
Merge: 0c13577 16cf5d4
Author: Nick Holub <nikholub@gmail.com>
Date:   Wed Feb 19 14:11:22 2014 -0800

    Merge branch 'console_config' of git://github.com/andyperlitch/Malhar into console_config

commit 13b17eafc1365fcd1878f0815ebd847a32afb14e
Merge: 16cf5d4 13aa19c
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Mon Feb 17 15:20:50 2014 -0800

    Merge branch 'master' into console_config

commit 16cf5d44aa70d8b7e19b65f40de3fde8e3ce4983
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Mon Feb 17 14:16:12 2014 -0800

    fixed back and continue links

commit 3e54c426be5156cb08ae6ee21400f8aa4210af8d
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Mon Feb 17 14:11:16 2014 -0800

    refactored wizard: added steps collection

commit d4c65e7307a0b4bb96528073028ad3a79cb38a68
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Fri Feb 14 11:50:02 2014 -0800

    removed dummy error icon for system step in welcome wizard

commit d695557538e71c0ab028cb6fe3df73adbc0811c8
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Fri Feb 14 10:09:44 2014 -0800

    updated instructions for welcome wizard

commit 246264b9e999690818217ff5bee984cf4286838e
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Fri Feb 14 10:08:36 2014 -0800

    fixed issue when clicking icon of next/prev buttons

commit 3a5d0df769cf2d1a3fe183ce371a0bd539ebdd03
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Fri Feb 14 10:08:04 2014 -0800

    added license headers

commit 12001cb0432d246ff0387e5829c206502542e723
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Fri Feb 14 09:51:10 2014 -0800

    split welcome and config pages

commit 1670e0df2f003bda9b6b993883d2232fae5df303
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Fri Feb 14 09:41:32 2014 -0800

    refactored modes

commit 7363a264bd847c107629dd439106518b049c0c88
Merge: 97c581b ad7f0e9
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Thu Feb 13 17:58:21 2014 -0800

    Merge branch 'master' into console_config

commit 97c581b4cb2acaa7db6f90bbdf6db459c9731a8a
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Mon Feb 10 16:55:42 2014 -0800

    added example issue visual

commit 203de2e9d4bd9874683fc10c50f24e3ce9431a2b
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Mon Feb 10 16:30:23 2014 -0800

    added more demo content

commit 4e086f2fc4deff265e0e34e98dbdfab1440d8094
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Mon Feb 10 16:13:11 2014 -0800

    updated system pane

commit fe797d203ee00ba15c37d3ed04dbe50a886f14b2
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Mon Feb 10 14:20:17 2014 -0800

    added nav buttons to installer panes

commit 0cda46c22612d2d4b7ec49b7d0366594c0e0a179
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Mon Feb 10 13:43:26 2014 -0800

    config list widget is not default

commit d6b9b00866cd4befcd150f0628c87c88fa88a946
Merge: 9d1cbc1 34a8588
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Mon Feb 10 13:41:26 2014 -0800

    Merge branch 'rewrite_urls_less_makebuild' into console_config

commit 9d1cbc11854157832495474a6b126b1e35c2adf5
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Mon Feb 10 12:32:01 2014 -0800

    added foundation for wizard

commit 8d0712e13a03fe256cff8a8fab6a02ab61d38bde
Merge: dbe68ca 470346d
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Mon Feb 10 10:35:47 2014 -0800

    Merge branch 'master' into console_config

    Conflicts:
    	front/css/alerts.css
    	front/css/bootstrap-overrides.css
    	front/css/bootstrap.css
    	front/css/charts.css
    	front/css/icons.css
    	front/css/jquery-ui.overrides.css
    	front/css/jquery-ui/jquery-ui-1.10.3.custom.css
    	front/css/jquery.pnotify.default.css
    	front/css/jquery.pnotify.overrides.css
    	front/css/main.css
    	front/css/mainsprite.css
    	front/css/palette.css
    	front/css/procedure.css
    	front/css/tables.css
    	front/css/widgets.css
    	front/package.json

commit dbe68ca9b5d4e6435b4fa012b3bb2c90f77a3491
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Thu Feb 6 16:31:16 2014 -0800

    config table better filtering

commit abe4baf6f1cf9d85e2fb84d502e5ef8496b56928
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Thu Feb 6 14:01:04 2014 -0800

    updates for console config screen

commit f1683d3e75f2415a94341f34e7681660b4a7dd63
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Wed Feb 5 09:58:24 2014 -0800

    started prototype for console config

commit 33141a6b5921aaca2aa9655a60fdf646268362d2
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Tue Feb 4 13:58:13 2014 -0800

    removed page template for config page

commit fff9d23141c66a2db661e087f9c05a658d730217
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Tue Feb 4 13:56:28 2014 -0800

    mocked API calls for config properties

commit 9610c67f22eb12fdb0a00d34ce608b74c24a33f5
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Tue Feb 4 13:43:18 2014 -0800

    added mock api calls for configProperties

commit 676f8a7464aca017982cf576a0da6b580f1cc78c
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Tue Feb 4 13:21:34 2014 -0800

    updated browserify version

commit 27fea693a9e5cf0be491d401b5f921f1ab04b705
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Tue Feb 4 13:07:58 2014 -0800

    fixed emitResize issue with page not containing dashboards

commit 50f80622094c4a29268bea081d704ff5fe210e3e
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Tue Feb 4 13:07:36 2014 -0800

    added bootstrap layout

commit ceb9968b914efb506ec4393ee639d6423e228002
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Tue Feb 4 12:54:21 2014 -0800

    added config property model and collection

commit 6cc905d88036ec4a45081de5f6d74ae055594486
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Tue Feb 4 12:25:31 2014 -0800

    added basic config page

commit 3066e9ae696d639b8284ba2f910574f9134c8a80
Author: Andy Perlitch <andyperlitch@gmail.com>
Date:   Tue Feb 4 11:42:34 2014 -0800

    added config mode
Merge pull request #738 from nickholub/inst_pull

Installer
Merge pull request #721 from DataTorrent/MLHR-780

MLHR-780 #fix #resolve #comment moved codecs into library.
Squashed commit of the following:

commit b7c9d723e1a9b2fcf7459157c29b0b0afba88781
Author: Nick Holub <nikholub@gmail.com>
Date:   Mon Mar 3 16:23:25 2014 -0800

    fix #MLHR-804 Config Page (Manage Properties)

commit 87d4e49e2791b098144b89ac7723214c720f3d59
Author: Nick Holub <nikholub@gmail.com>
Date:   Mon Mar 3 15:04:25 2014 -0800

    fix #MLHR-804 Config Page (Manage Properties)

commit ab5aac4f7d8c36476ca627b005efdba085ba54c9
Author: Nick Holub <nikholub@gmail.com>
Date:   Mon Mar 3 14:42:43 2014 -0800

    fix #MLHR-804 Config Page (Manage Properties)
Merge pull request #739 from nickholub/inst1_pull

Installer Update