Sync Master with latest Build

Gruntfile.js

@@ -198,7 +198,7 @@ module.exports = function(grunt) {
 				src: app,
 				dest: 'dist/js/app.js'
 			},
-			js: {
+			app: {
 				options: {
 					sourceMap: true
 				},
@@ -233,6 +233,6 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks('grunt-contrib-uglify');
 	grunt.loadNpmTasks('grunt-http');
 
-	grunt.registerTask('default', ['http', 'clean', 'jade', 'copy', 'cssmin', 'concat:vendor', 'concat:app', 'uglify', 'concat:js', 'concat:css', 'clean:cleanup_js', 'clean:cleanup_css']);
+	grunt.registerTask('default', ['http', 'clean', 'jade', 'copy', 'cssmin', 'concat:vendor', 'concat:app', 'uglify', 'concat:app', 'concat:css', 'clean:cleanup_js', 'clean:cleanup_css']);
 	grunt.registerTask('build', 'default');
 };

dist/dao.html

@@ -87,10 +87,11 @@ <h4>The code</h4>
         uint memberSince;
     }
 
-      modifier onlyOwner {
-          require (msg.sender == owner);
-          _;
-      }
+    struct Vote {
+        bool inSupport;
+        address voter;
+        string justification;
+    }
 
     // Modifier that allows only shareholders to vote and create new proposals
     modifier onlyMembers {
@@ -142,11 +143,12 @@ <h4>The code</h4>
     function removeMember(address targetMember) onlyOwner {
         require(memberId[targetMember] != 0);
 
-      struct Vote {
-          bool inSupport;
-          address voter;
-          string justification;
-      }
+        for (uint i = memberId[targetMember]; i&lt;members.length-1; i++){
+            members[i] = members[i+1];
+        }
+        delete members[members.length-1];
+        members.length--;
+    }
 
     /**
      * Change voting rules
@@ -167,18 +169,8 @@ <h4>The code</h4>
         debatingPeriodInMinutes = minutesForDebate;
         majorityMargin = marginOfVotesForMajority;
 
-      /* First time setup */
-      function Congress (
-          uint minimumQuorumForProposals,
-          uint minutesForDebate,
-          int marginOfVotesForMajority
-      )  payable {
-          changeVotingRules(minimumQuorumForProposals, minutesForDebate, marginOfVotesForMajority);
-          // It’s necessary to add an empty first member
-          addMember(0, &quot;&quot;);
-          // and let&#39;s add the founder, to save a step later       
-          addMember(owner, &#39;founder&#39;);        
-      }
+        ChangeOfRules(minimumQuorum, debatingPeriodInMinutes, majorityMargin);
+    }
 
     /**
      * Add Proposal
@@ -212,10 +204,8 @@ <h4>The code</h4>
         ProposalAdded(proposalID, beneficiary, weiAmount, jobDescription);
         numProposals = proposalID+1;
 
-      /// @notice Remove membership from `targetMember`
-      /// @param targetMember ethereum address to be removed
-      function removeMember(address targetMember) onlyOwner {
-          require(memberId[targetMember] != 0);
+        return proposalID;
+    }
 
     /**
      * Add proposal in Ether

views/layout.jade

@@ -16,7 +16,7 @@ html
     //- Open Graph data
     meta(property="og:title", content=title)
     meta(property="og:type", content="article")
-    if url 
+    if url
         meta(property="og:url", content="https://www.ethereum.org/"+url)
     else
         meta(property="og:url", content="https://www.ethereum.org/")
@@ -63,5 +63,3 @@ html
         |    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
         |    ga('create', 'UA-52040685-2', 'auto');
         |    ga('send', 'pageview');
-
-