Merge remote-tracking branch 'remotes/origin/master' into AD-51-easy-to-view-manage-1-editions-coi

Conflicts:
	piece/models.py
	web/urls/frontend.py

js/components/ascribe_forms/input_text.js

@@ -8,7 +8,7 @@ let InputText = React.createClass({
 
     getInitialState() {
         return {value: null,
-                alerts: null
+                alerts: null // needed in AlertMixin
         };
     },
     handleChange(event) {

js/components/ascribe_forms/input_textarea.js

@@ -27,7 +27,6 @@ let InputTextArea = React.createClass({
                     onChange={this.handleChange}></textarea>
             </div>
         );
-
     }
 });