Merge branch 'master' into master

assets/js/components/Options.jsx

@@ -142,11 +142,12 @@ var Options = React.createClass({
             }
 
             return (
-                <SitesList
-                    handleChange={that._updateWhitelistState}
-                    label="Whitelist"
-                    sites={that.state.whitelist}
-                    helpText="Sites that you want to show in your reports." />
+              <SitesList
+                  handleChange={that._updateWhitelistState}
+                  label="Whitelist"
+                  sites={that.state.whitelist}
+                  placeholder="http://google.com&#10;http://myproject.com@@MyProject"
+                  helpText="Sites that you want to show in your reports. You can assign URL to project by adding @@YourProject at the end of line." />
             );
 
         };