Merge branch 'master' of github.com:diaspora/diaspora

210 files changed, 4131 insertions, 14 deletions

diff --git a/Capfile b/Capfile
index 1a98f3cef..ef90fbcda 100644
--- a/Capfile
+++ b/Capfile
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 load 'deploy' if respond_to?(:namespace) # cap2 differentiator
 Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
 
diff --git a/GNU-AGPL-3.0 b/GNU-AGPL-3.0
new file mode 100644
index 000000000..a871fcfd0
--- /dev/null
+++ b/GNU-AGPL-3.0
@@ -0,0 +1,662 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
+
diff --git a/Rakefile b/Rakefile
index 0655d29d1..4e0f206a3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb
index c946f7508..094f7e469 100644
--- a/app/controllers/albums_controller.rb
+++ b/app/controllers/albums_controller.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 class AlbumsController < ApplicationController
   before_filter :authenticate_user!
 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6361e11c2..7d7c28dd2 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 class ApplicationController < ActionController::Base
   
   protect_from_forgery :except => :receive
diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index 951dcdb1a..0253e819f 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 class AspectsController < ApplicationController
   before_filter :authenticate_user!
 
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index a1091a022..4e446758d 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 class CommentsController < ApplicationController
   before_filter :authenticate_user!
   
diff --git a/app/controllers/dev_utilities_controller.rb b/app/controllers/dev_utilities_controller.rb
index 78fdc14c7..994a014d0 100644
--- a/app/controllers/dev_utilities_controller.rb
+++ b/app/controllers/dev_utilities_controller.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 class DevUtilitiesController < ApplicationController
   before_filter :authenticate_user!, :except => [:set_backer_number]
   include ApplicationHelper
diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
index 1a9012589..998839a5c 100644
--- a/app/controllers/people_controller.rb
+++ b/app/controllers/people_controller.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 class PeopleController < ApplicationController
   before_filter :authenticate_user!
 
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index b684c986d..7df4fe55a 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 class PhotosController < ApplicationController
   before_filter :authenticate_user!
 
diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb
index da7d8219e..d81746790 100644
--- a/app/controllers/publics_controller.rb
+++ b/app/controllers/publics_controller.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 class PublicsController < ApplicationController
   require 'lib/diaspora/parser'
   include Diaspora::Parser
diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb
index 97be87a3f..5d863661c 100644
--- a/app/controllers/requests_controller.rb
+++ b/app/controllers/requests_controller.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 class RequestsController < ApplicationController
   before_filter :authenticate_user!
   include RequestsHelper 
diff --git a/app/controllers/sockets_controller.rb b/app/controllers/sockets_controller.rb
index 2d5ae315a..d49130ab4 100644
--- a/app/controllers/sockets_controller.rb
+++ b/app/controllers/sockets_controller.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 class SocketsController < ApplicationController 
   include ApplicationHelper
   include SocketsHelper
diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index 8643183c8..41f1d1e1f 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 class StatusMessagesController < ApplicationController
   before_filter :authenticate_user!
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 904598dfb..b466841d0 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 class UsersController < ApplicationController
   before_filter :authenticate_user!, :except => [:new, :create]
 
diff --git a/app/helpers/albums_helper.rb b/app/helpers/albums_helper.rb
index 337ce608f..712b7ac72 100644
--- a/app/helpers/albums_helper.rb
+++ b/app/helpers/albums_helper.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 module AlbumsHelper
   def friends_albums_link
     if params[:friends]
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 61b33dbd8..04ae66897 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 module ApplicationHelper
   
   def current_aspect?(aspect)
diff --git a/app/helpers/aspects_helper.rb b/app/helpers/aspects_helper.rb
index b6764f44d..d67ecca0b 100644
--- a/app/helpers/aspects_helper.rb
+++ b/app/helpers/aspects_helper.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 module AspectsHelper
   def link_for_aspect( aspect )
     link_to aspect.name, aspect
diff --git a/app/helpers/blogs_helper.rb b/app/helpers/blogs_helper.rb
deleted file mode 100644
index cc0dbd200..000000000
--- a/app/helpers/blogs_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module BlogsHelper
-end
diff --git a/app/helpers/bookmarks_helper.rb b/app/helpers/bookmarks_helper.rb
deleted file mode 100644
index 2f5878156..000000000
--- a/app/helpers/bookmarks_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module BookmarksHelper
-end
diff --git a/app/helpers/comments_helper.rb b/app/helpers/comments_helper.rb
deleted file mode 100644
index b1e4df9cd..000000000
--- a/app/helpers/comments_helper.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module CommentsHelper
-
-end
diff --git a/app/helpers/dashboards_helper.rb b/app/helpers/dashboards_helper.rb
index 3117b77ff..b1fb1bdf3 100644
--- a/app/helpers/dashboards_helper.rb
+++ b/app/helpers/dashboards_helper.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 module DashboardsHelper
 
   def title_for_page
diff --git a/app/helpers/error_messages_helper.rb b/app/helpers/error_messages_helper.rb
index 925757305..09075b88e 100644
--- a/app/helpers/error_messages_helper.rb
+++ b/app/helpers/error_messages_helper.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 module ErrorMessagesHelper
   # Render error messages for the given objects. The :message and :header_message options are allowed.
   def error_messages_for(*objects)
diff --git a/app/helpers/friends_helper.rb b/app/helpers/friends_helper.rb
deleted file mode 100644
index 0b69e9bce..000000000
--- a/app/helpers/friends_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module FriendsHelper
-end
diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb
index 7c5ce5006..c7ad44b19 100644
--- a/app/helpers/layout_helper.rb
+++ b/app/helpers/layout_helper.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 # These helper methods can be called in your template to set variables to be used in the layout
 # This module should be included in all views globally,
 # to do so you may need to add this line to your ApplicationController
diff --git a/app/helpers/people_helper.rb b/app/helpers/people_helper.rb
index e86b8f7aa..cb6e49225 100644
--- a/app/helpers/people_helper.rb
+++ b/app/helpers/people_helper.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 module PeopleHelper
   
   def search_or_index
diff --git a/app/helpers/photos_helper.rb b/app/helpers/photos_helper.rb
index faf29ed63..97ce8ad4b 100644
--- a/app/helpers/photos_helper.rb
+++ b/app/helpers/photos_helper.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 module PhotosHelper
   
   def linked_scaled_photo(photo, album)
diff --git a/app/helpers/publics_helper.rb b/app/helpers/publics_helper.rb
index 1e8ecac8f..a6f1dfc22 100644
--- a/app/helpers/publics_helper.rb
+++ b/app/helpers/publics_helper.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 module PublicsHelper
   def subscribe(opts = {})
     subscriber = Subscriber.first(:url => opts[:callback], :topic => opts[:topic])
diff --git a/app/helpers/requests_helper.rb b/app/helpers/requests_helper.rb
index e40f6bde8..492fff77f 100644
--- a/app/helpers/requests_helper.rb
+++ b/app/helpers/requests_helper.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 module RequestsHelper
 
   def subscription_mode(profile)
diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb
index 234e84b3f..f88799166 100644
--- a/app/helpers/sockets_helper.rb
+++ b/app/helpers/sockets_helper.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 module SocketsHelper
  include ApplicationHelper 
   
diff --git a/app/helpers/status_messages_helper.rb b/app/helpers/status_messages_helper.rb
index 840e789a0..1fa606d45 100644
--- a/app/helpers/status_messages_helper.rb
+++ b/app/helpers/status_messages_helper.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 module StatusMessagesHelper
   def my_latest_message
     unless @latest_status_message.nil?
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
deleted file mode 100644
index 2310a240d..000000000
--- a/app/helpers/users_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module UsersHelper
-end
diff --git a/app/models/album.rb b/app/models/album.rb
index d153dcc9c..48927e126 100644
--- a/app/models/album.rb
+++ b/app/models/album.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 class Album < Post
 
   xml_reader :name
diff --git a/app/models/aspect.rb b/app/models/aspect.rb
index 7271327b1..616e6a05f 100644
--- a/app/models/aspect.rb
+++ b/app/models/aspect.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 class Aspect
   include MongoMapper::Document
   
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 1826efd0c..3382d7388 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 class Comment
   include MongoMapper::Document
   include ROXML
diff --git a/app/models/person.rb b/app/models/person.rb
index d2e90485d..f7d2cc556 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 require 'lib/hcard'
 
 class Person
diff --git a/app/models/photo.rb b/app/models/photo.rb
index 976d354a9..bd64170b7 100644
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 class Photo < Post
   require 'carrierwave/orm/mongomapper'
   include MongoMapper::Document
diff --git a/app/models/post.rb b/app/models/post.rb
index a072d1dc3..10e7ac8ea 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 class Post 
   require 'lib/encryptable'
   include MongoMapper::Document
diff --git a/app/models/profile.rb b/app/models/profile.rb
index 3f8b18a30..2b175f4e3 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 class Profile
   include MongoMapper::EmbeddedDocument
   require 'lib/diaspora/webhooks'
diff --git a/app/models/request.rb b/app/models/request.rb
index b92357d69..a9cb2e6f2 100644
--- a/app/models/request.rb
+++ b/app/models/request.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 class Request
   require 'lib/diaspora/webhooks'
   include MongoMapper::Document
diff --git a/app/models/retraction.rb b/app/models/retraction.rb
index cf52720ed..c632d62bb 100644
--- a/app/models/retraction.rb
+++ b/app/models/retraction.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 class Retraction
   include ROXML
   include Diaspora::Webhooks
diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index 4c43a2244..ed2d80804 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 class StatusMessage < Post
   
   xml_name :status_message
diff --git a/app/models/user.rb b/app/models/user.rb
index 449c99745..43c2d3d06 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 require 'lib/diaspora/user/friending.rb'
 require 'lib/diaspora/user/querying.rb'
 require 'lib/salmon/salmon'
@@ -29,10 +48,13 @@ class User
 
   before_validation_on_create :setup_person
   before_validation :do_bad_things 
+  before_save :downcase_username
   
    def self.find_for_authentication(conditions={})
     if conditions[:username] =~ /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i # email regex
       conditions[:email] = conditions.delete(:username)
+    else
+      conditions[:username].downcase!
     end
     super
   end 
@@ -303,6 +325,9 @@ class User
     self.person.save!
   end
 
+  def downcase_username
+    username.downcase!
+  end
 
 
   def as_json(opts={})
diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb
index 0ae5ce446..6f05a68da 100644
--- a/app/uploaders/image_uploader.rb
+++ b/app/uploaders/image_uploader.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 class ImageUploader < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
 
diff --git a/app/views/albums/_album.html.haml b/app/views/albums/_album.html.haml
index bf28846b5..2d4d370a0 100644
--- a/app/views/albums/_album.html.haml
+++ b/app/views/albums/_album.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 .album{:id => post.id, :class => ("mine" if current_user.owns?(post))}
 
   %div.name
diff --git a/app/views/albums/_new_album.haml b/app/views/albums/_new_album.haml
index 75438989b..aef2a6ae1 100644
--- a/app/views/albums/_new_album.haml
+++ b/app/views/albums/_new_album.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 %h1 Add a new album
 
 = form_for Album.new do |f|
diff --git a/app/views/albums/edit.html.haml b/app/views/albums/edit.html.haml
index 43a80aeda..6eb5c1f97 100644
--- a/app/views/albums/edit.html.haml
+++ b/app/views/albums/edit.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 .back= link_to "⇧ #{@album.name}", @album
 %h1.big_text
 
diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml
index f3f0c9b44..2c1078ff9 100644
--- a/app/views/albums/index.html.haml
+++ b/app/views/albums/index.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 - content_for :head do
   :javascript
     $(document).ready(function(){
diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml
index 0bc2dc094..b3a3e0170 100644
--- a/app/views/albums/show.html.haml
+++ b/app/views/albums/show.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 :javascript
   $(document).ready(function(){
     $(".image_thumb img").load( function() {
diff --git a/app/views/aspects/_new_aspect.haml b/app/views/aspects/_new_aspect.haml
index 1533d4f5d..b72ced438 100644
--- a/app/views/aspects/_new_aspect.haml
+++ b/app/views/aspects/_new_aspect.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 %h1 Add a new aspect
 = form_for Aspect.new do |f|
   = f.error_messages
diff --git a/app/views/aspects/edit.html.haml b/app/views/aspects/edit.html.haml
index 91ab0149f..683da67f1 100644
--- a/app/views/aspects/edit.html.haml
+++ b/app/views/aspects/edit.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 - content_for :head do 
   = javascript_include_tag 'jquery-ui-1.8.4.custom.min.js'
   = javascript_include_tag 'aspect-edit.js'
diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
index aea12cfe5..ab4fdfd06 100644
--- a/app/views/aspects/index.html.haml
+++ b/app/views/aspects/index.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 - content_for :page_title do
   Home
 
diff --git a/app/views/aspects/new.html.haml b/app/views/aspects/new.html.haml
index 423725d9f..5777171d7 100644
--- a/app/views/aspects/new.html.haml
+++ b/app/views/aspects/new.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 %h1.big_text
   =link_to 'aspects', aspects_path 
   >>
diff --git a/app/views/aspects/show.html.haml b/app/views/aspects/show.html.haml
index aea12cfe5..ab4fdfd06 100644
--- a/app/views/aspects/show.html.haml
+++ b/app/views/aspects/show.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 - content_for :page_title do
   Home
 
diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
index 0c7fe954d..710cc115b 100644
--- a/app/views/comments/_comment.html.haml
+++ b/app/views/comments/_comment.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 %li.comment{:id => post.id} 
   = person_image_tag(post.person)
   %span.from
diff --git a/app/views/comments/_comments.html.haml b/app/views/comments/_comments.html.haml
index 38ba10aab..30fc8643d 100644
--- a/app/views/comments/_comments.html.haml
+++ b/app/views/comments/_comments.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 %div.comments
   %ul.comment_set{:id => post.id}
     - for comment in post.comments
diff --git a/app/views/comments/_new_comment.html.haml b/app/views/comments/_new_comment.html.haml
index 494139356..f5dbe73c7 100644
--- a/app/views/comments/_new_comment.html.haml
+++ b/app/views/comments/_new_comment.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 = form_for Comment.new, :remote => true do |f|
   %p
     %label{:for => "comment_text_on_#{post.id}"} Comment
diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
index 9e87800c9..5d52500da 100644
--- a/app/views/js/_websocket_js.haml
+++ b/app/views/js/_websocket_js.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 = javascript_include_tag 'FABridge', 'swfobject', 'web_socket'
 :javascript
   WebSocket.__swfLocation = "/javascripts/WebSocketMain.swf";
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index bb508be56..7b9282081 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 !!!
 %html
   %head
diff --git a/app/views/layouts/session_wall.html.haml b/app/views/layouts/session_wall.html.haml
index 945ddab92..56ef4646b 100644
--- a/app/views/layouts/session_wall.html.haml
+++ b/app/views/layouts/session_wall.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 !!!
 %html
   %head
diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml
index 423814349..3c1d27b9e 100644
--- a/app/views/people/index.html.haml
+++ b/app/views/people/index.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 %h1.big_text
   .back
     = link_to "⇧ home", root_path
diff --git a/app/views/people/new.html.haml b/app/views/people/new.html.haml
index e341d8629..4f85ff3c4 100644
--- a/app/views/people/new.html.haml
+++ b/app/views/people/new.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 - title "New Person"
 
 = form_for @person do |f|
diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml
index e9c445299..423f3016c 100644
--- a/app/views/people/show.html.haml
+++ b/app/views/people/show.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 - content_for :page_title do
   = @person.real_name
 
diff --git a/app/views/photos/_new_photo.haml b/app/views/photos/_new_photo.haml
index cfc67bdbf..6c57d9d96 100644
--- a/app/views/photos/_new_photo.haml
+++ b/app/views/photos/_new_photo.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 :javascript
   function createUploader(){            
     var uploader = new qq.FileUploader({
diff --git a/app/views/photos/_photo.haml b/app/views/photos/_photo.haml
index d44c056ba..9d734c315 100644
--- a/app/views/photos/_photo.haml
+++ b/app/views/photos/_photo.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 %li.message{:id => post.id}
 
   = person_image_tag(post.person)
diff --git a/app/views/photos/edit.html.haml b/app/views/photos/edit.html.haml
index baeb82a3d..fa5ea839f 100644
--- a/app/views/photos/edit.html.haml
+++ b/app/views/photos/edit.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 %h1.big_text
   .back
     = link_to "⇧ #{@album.name}", album_path(@album)
diff --git a/app/views/photos/new.html.haml b/app/views/photos/new.html.haml
index b8fe5d3b5..02d6448e1 100644
--- a/app/views/photos/new.html.haml
+++ b/app/views/photos/new.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 - title "New Photo"
 
 = form_for( @photo, :html => {:multipart => true}) do |f|
diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index 37ccdcc9e..bbd1ec21f 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 :javascript
   $(document).keydown(function(e){
     switch(e.keyCode) {
diff --git a/app/views/posts/_debug.haml b/app/views/posts/_debug.haml
index ad1b3f1d8..43978ecb8 100644
--- a/app/views/posts/_debug.haml
+++ b/app/views/posts/_debug.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 #debug_info
   %h5 DEBUG INFO
   #debug_more{ :style => "display:none;" }
diff --git a/app/views/posts/_post.html.haml b/app/views/posts/_post.html.haml
index 6594bc07c..d14ef4ed7 100644
--- a/app/views/posts/_post.html.haml
+++ b/app/views/posts/_post.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 %ul
   %h3= link_to post.class, object_path(post) 
   - for field in object_fields(post)
diff --git a/app/views/requests/_new_request.haml b/app/views/requests/_new_request.haml
index 5f4391f51..54642ffaf 100644
--- a/app/views/requests/_new_request.haml
+++ b/app/views/requests/_new_request.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 %h1
   Add a new friend to
   %i= @aspect.name
diff --git a/app/views/requests/_request.html.haml b/app/views/requests/_request.html.haml
index ff1ca8da4..87fa09cb3 100644
--- a/app/views/requests/_request.html.haml
+++ b/app/views/requests/_request.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 :javascript
   $(document).ready(function(){
     $(".aspect_selector").change( function() {
diff --git a/app/views/requests/edit.html.haml b/app/views/requests/edit.html.haml
index c1a6ea854..471041049 100644
--- a/app/views/requests/edit.html.haml
+++ b/app/views/requests/edit.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 - title "Edit Request"
 
 = render 'form'
diff --git a/app/views/requests/index.html.haml b/app/views/requests/index.html.haml
index 6ba3067c5..5e85697dd 100644
--- a/app/views/requests/index.html.haml
+++ b/app/views/requests/index.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 %h1.big_text
   .back
     = link_to "⇧ home", root_path
diff --git a/app/views/requests/show.html.haml b/app/views/requests/show.html.haml
index 2b01ac76d..cb8045c5a 100644
--- a/app/views/requests/show.html.haml
+++ b/app/views/requests/show.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 - title "Request"
 
 %p
diff --git a/app/views/shared/_aspect_friends.haml b/app/views/shared/_aspect_friends.haml
index 0a79085f9..f3e3a334b 100644
--- a/app/views/shared/_aspect_friends.haml
+++ b/app/views/shared/_aspect_friends.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 #friend_pictures
   - for friend in @friends
     = person_image_link(friend)
diff --git a/app/views/shared/_aspect_nav.haml b/app/views/shared/_aspect_nav.haml
index 257a1d1c9..bad149c28 100644
--- a/app/views/shared/_aspect_nav.haml
+++ b/app/views/shared/_aspect_nav.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 #aspect_nav
   %ul
     - for aspect in @aspects
diff --git a/app/views/shared/_post_wrapper.haml b/app/views/shared/_post_wrapper.haml
index a65866a08..c14e22907 100644
--- a/app/views/shared/_post_wrapper.haml
+++ b/app/views/shared/_post_wrapper.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 %li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))}
   = person_image_link(post.person)
   = yield post_yield_tag(post)
diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml
index 584f30ebe..93ed0b59e 100644
--- a/app/views/shared/_publisher.haml
+++ b/app/views/shared/_publisher.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 #publisher
   = owner_image_tag
 
diff --git a/app/views/shared/log.haml b/app/views/shared/log.haml
index 273b21836..7a6e43517 100644
--- a/app/views/shared/log.haml
+++ b/app/views/shared/log.haml
@@ -1 +1,20 @@
-= @log.to_s
\ No newline at end of file
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
+= @log.to_s
diff --git a/app/views/status_messages/_new_status_message.haml b/app/views/status_messages/_new_status_message.haml
index 84f58d76a..62ab81778 100644
--- a/app/views/status_messages/_new_status_message.haml
+++ b/app/views/status_messages/_new_status_message.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 = form_for StatusMessage.new, :remote => true do |f|
   = f.error_messages
   %p
diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml
index 5c8f041c0..14c402529 100644
--- a/app/views/status_messages/_status_message.html.haml
+++ b/app/views/status_messages/_status_message.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 %li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))}
 
   = person_image_link(post.person)
diff --git a/app/views/status_messages/index.html.haml b/app/views/status_messages/index.html.haml
index 28cf8be85..a86eb1bbd 100644
--- a/app/views/status_messages/index.html.haml
+++ b/app/views/status_messages/index.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 %h1.big_text status messages
 = render "status_messages/new_status_message", :status_message => @status_message
 %ul#stream
diff --git a/app/views/status_messages/show.html.haml b/app/views/status_messages/show.html.haml
index f40a47884..641f382c6 100644
--- a/app/views/status_messages/show.html.haml
+++ b/app/views/status_messages/show.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 - title "Status Message"
 
 %p
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index 9901a8c73..73b4f6c1f 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -1,3 +1,22 @@
+/    Copyright 2010 Diaspora Inc.
+/
+/    This file is part of Diaspora.
+/
+/    Diaspora is free software: you can redistribute it and/or modify
+/    it under the terms of the GNU Affero General Public License as published by
+/    the Free Software Foundation, either version 3 of the License, or
+/    (at your option) any later version.
+/
+/    Diaspora is distributed in the hope that it will be useful,
+/    but WITHOUT ANY WARRANTY; without even the implied warranty of
+/    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/    GNU Affero General Public License for more details.
+/
+/    You should have received a copy of the GNU Affero General Public License
+/    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+/
+
+
 %h1.big_text
   .back
     = link_to "⇧ home", root_path
diff --git a/autotest/discover.rb b/autotest/discover.rb
index f421dc5ff..6270cb423 100644
--- a/autotest/discover.rb
+++ b/autotest/discover.rb
@@ -1,2 +1,21 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 Autotest.add_discovery { "rails" }
 Autotest.add_discovery { "rspec2" }
diff --git a/config.ru b/config.ru
index ebd2f327f..d33ba7374 100644
--- a/config.ru
+++ b/config.ru
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment',  __FILE__)
diff --git a/config/app_config.yml b/config/app_config.yml
index 1eee9376c..f52f1bd77 100644
--- a/config/app_config.yml
+++ b/config/app_config.yml
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 development:
   debug: false
   socket_debug : false
diff --git a/config/application.rb b/config/application.rb
index f303e3446..553f1eee8 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.expand_path('../boot', __FILE__)
 
 require "action_controller/railtie"
diff --git a/config/boot.rb b/config/boot.rb
index ab6cb374d..b53143f3f 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require 'rubygems'
 
 # Set up gems listed in the Gemfile.
diff --git a/config/environment.rb b/config/environment.rb
index 948fbbca4..b3bbadb48 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 # Load the rails application
 require File.expand_path('../application', __FILE__)
 Haml::Template.options[:format] = :html5
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 7469baa90..4da09b4f9 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 require 'lib/mongo_mapper/clear_dev_memory'
 Diaspora::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 0dc2c9b99..4f569446d 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 Diaspora::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
 
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 7615ffb1e..a8e685993 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 Diaspora::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
 
diff --git a/config/initializers/_mongo.rb b/config/initializers/_mongo.rb
index 655977953..f440b857d 100644
--- a/config/initializers/_mongo.rb
+++ b/config/initializers/_mongo.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 MongoMapper.connection = Mongo::Connection.new('localhost', 27017)
 
 MongoMapper.database = "diaspora-#{Rails.env}"
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
index 59385cdf3..ac8741844 100644
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index 0fe280e02..df68ab031 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 CarrierWave.configure do |config|
   config.storage = :file
 end
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index a3bd4fc8f..df25a0e2a 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 # Use this hook to configure devise mailer, warden hooks and so forth. The first
 # four configuration values can also be set straight in your models.
 Devise.setup do |config|
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index fdca7d7b4..8d7d7fcfe 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format 
diff --git a/config/initializers/load_app_config.rb b/config/initializers/load_app_config.rb
index 4e5bbdd9d..ff27e8a80 100644
--- a/config/initializers/load_app_config.rb
+++ b/config/initializers/load_app_config.rb
@@ -1,2 +1,21 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 raw_config = File.read("#{Rails.root}/config/app_config.yml")
 APP_CONFIG = YAML.load(raw_config)[Rails.env].symbolize_keys
diff --git a/config/initializers/logging.rb b/config/initializers/logging.rb
index 447ec5c17..9517b2644 100644
--- a/config/initializers/logging.rb
+++ b/config/initializers/logging.rb
@@ -1,2 +1,21 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 Rails.logger = Logger.new(
   Rails.root.join("log",Rails.env + ".log"),3,5*1024*1024)
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index 72aca7e44..01b410cec 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:
diff --git a/config/initializers/rspec_generator.rb b/config/initializers/rspec_generator.rb
index 9adece73e..2c5bd8f9d 100644
--- a/config/initializers/rspec_generator.rb
+++ b/config/initializers/rspec_generator.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 Diaspora::Application.configure do
   config.generators do |g|
     g.integration_tool :rspec
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
index 70747951a..f5b3f0a7f 100644
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 # Be sure to restart your server when you modify this file.
 
 # Your secret key for verifying the integrity of signed cookies.
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 2aeb1137f..f11c8a336 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.session_store :cookie_store, :key => '_diaspora_session'
diff --git a/config/initializers/socket.rb b/config/initializers/socket.rb
index 03f9e24eb..bf1415084 100644
--- a/config/initializers/socket.rb
+++ b/config/initializers/socket.rb
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 require 'em-websocket'
 require 'eventmachine'
 require "lib/diaspora/websocket"
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
index b70c97bb8..e972c2dfd 100644
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 en:
   errors:
     messages:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a747bfa69..625338623 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 # Sample localization file for English. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
diff --git a/config/routes.rb b/config/routes.rb
index 110644b27..ef64b8d5e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 Diaspora::Application.routes.draw do
   resources :people, :only => [:index, :show, :destroy]
   resources :users, :except => [:create, :new]
diff --git a/config/selenium.yml b/config/selenium.yml
index 83ab2917f..87ad6b2d7 100644
--- a/config/selenium.yml
+++ b/config/selenium.yml
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 common: &common
   # Try to kill mongrel after suite if tmp/pids/mongrel_selenium.pid exists
   # kill_mongrel_after_suite: true
diff --git a/config/sprinkle/conf/nginx.conf b/config/sprinkle/conf/nginx.conf
index ad79a9b5a..495c89f79 100644
--- a/config/sprinkle/conf/nginx.conf
+++ b/config/sprinkle/conf/nginx.conf
@@ -1,3 +1,22 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 
 worker_processes 1;
 pid /tmp/pids/nginx.pid;
diff --git a/config/sprinkle/packages/database.rb b/config/sprinkle/packages/database.rb
index bb820fcc0..bca0688dc 100644
--- a/config/sprinkle/packages/database.rb
+++ b/config/sprinkle/packages/database.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 #package :mongo, :provides => :database do
 #  description 'Mongodb'
 #	version '1.4.3'
diff --git a/config/sprinkle/packages/essential.rb b/config/sprinkle/packages/essential.rb
index 0d69e7510..719dcdc90 100644
--- a/config/sprinkle/packages/essential.rb
+++ b/config/sprinkle/packages/essential.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 ## Special package, anything that defines a 'source' package means build-essential should be installed for Ubuntu
 
 package :build_essential do
diff --git a/config/sprinkle/packages/ruby.rb b/config/sprinkle/packages/ruby.rb
index 13ece39ca..f0cecd904 100644
--- a/config/sprinkle/packages/ruby.rb
+++ b/config/sprinkle/packages/ruby.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 ## Defines available packages
 
 package :ruby do
diff --git a/config/sprinkle/packages/scm.rb b/config/sprinkle/packages/scm.rb
index 225c37797..0308090d7 100644
--- a/config/sprinkle/packages/scm.rb
+++ b/config/sprinkle/packages/scm.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 package :git, :provides => :scm do
   description 'Git Distributed Version Control'
 	apt %w( git-core )
diff --git a/config/sprinkle/packages/server.rb b/config/sprinkle/packages/server.rb
index c553707b3..58074f619 100644
--- a/config/sprinkle/packages/server.rb
+++ b/config/sprinkle/packages/server.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 package :nginx, :provides=> :webserver do
   description 'Nginx HTTP server'
   version '0.7.67'
diff --git a/config/sprinkle/packages/unfortunately_essential.rb b/config/sprinkle/packages/unfortunately_essential.rb
index a4114aabc..efe84d0fc 100644
--- a/config/sprinkle/packages/unfortunately_essential.rb
+++ b/config/sprinkle/packages/unfortunately_essential.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 #Fix dreamhost
 #
 
diff --git a/config/sprinkle/provision.rb b/config/sprinkle/provision.rb
index e085a2602..f2306a808 100644
--- a/config/sprinkle/provision.rb
+++ b/config/sprinkle/provision.rb
@@ -1,4 +1,24 @@
 #!/usr/bin/env sprinkle -s
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 
 
 require "#{File.dirname(__FILE__)}/packages/essential"
diff --git a/config/thin.yml b/config/thin.yml
index eb066d83e..121ed892e 100644
--- a/config/thin.yml
+++ b/config/thin.yml
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 rackup: /usr/local/app/diaspora/current/config.ru
 pid: /tmp/pids/thin.pid
 wait: 30
diff --git a/db/schema.rb b/db/schema.rb
index b81ae5a56..89144f3ab 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 # This file is auto-generated from the current state of the database. Instead of editing this file, 
 # please use the migrations feature of Active Record to incrementally modify your database, and
 # then regenerate this schema definition.
diff --git a/db/seeds.rb b/db/seeds.rb
index 75a6b057d..b1548b03b 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 # This file should contain all the record creation needed to seed the database with its default values.
 # The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
 #
diff --git a/db/seeds/backer.rb b/db/seeds/backer.rb
index 139ca5fa2..92969b057 100644
--- a/db/seeds/backer.rb
+++ b/db/seeds/backer.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 # This file should contain all the record creation needed to seed the database with its default values.
 # The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
 #
diff --git a/db/seeds/dev.rb b/db/seeds/dev.rb
index 2dc820394..bf4b4e5a0 100644
--- a/db/seeds/dev.rb
+++ b/db/seeds/dev.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require 'config/environment'
 
 host = "localhost:3000"
diff --git a/db/seeds/tom.rb b/db/seeds/tom.rb
index 9bff57251..d8cbd0718 100644
--- a/db/seeds/tom.rb
+++ b/db/seeds/tom.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require 'config/environment'
 
 remote_url = "http://tom.joindiaspora.com/"
diff --git a/lib/chrome_frame.rb b/lib/chrome_frame.rb
index 298427ee7..5ae18e5b1 100644
--- a/lib/chrome_frame.rb
+++ b/lib/chrome_frame.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 module Rack
   class ChromeFrame
 
@@ -60,4 +80,4 @@ module Rack
       ua_string.match(/MSIE (\S+)/)[1].to_f
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/diaspora.rb b/lib/diaspora.rb
index 8b6314488..1d7be2a84 100644
--- a/lib/diaspora.rb
+++ b/lib/diaspora.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 module Diaspora
 
   autoload :Parser
diff --git a/lib/diaspora/parser.rb b/lib/diaspora/parser.rb
index 51523724d..56ee63ae2 100644
--- a/lib/diaspora/parser.rb
+++ b/lib/diaspora/parser.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 module Diaspora
   module Parser
     def self.owner_id_from_xml(xml)
diff --git a/lib/diaspora/user/friending.rb b/lib/diaspora/user/friending.rb
index 175558514..1ef431c06 100644
--- a/lib/diaspora/user/friending.rb
+++ b/lib/diaspora/user/friending.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 module Diaspora
   module UserModules
     module Friending
diff --git a/lib/diaspora/user/querying.rb b/lib/diaspora/user/querying.rb
index 50f7650fe..1d66e70be 100644
--- a/lib/diaspora/user/querying.rb
+++ b/lib/diaspora/user/querying.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 module Diaspora
   module UserModules
     module Querying
diff --git a/lib/diaspora/webhooks.rb b/lib/diaspora/webhooks.rb
index d235e0f08..889e7735f 100644
--- a/lib/diaspora/webhooks.rb
+++ b/lib/diaspora/webhooks.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 module Diaspora
   module Webhooks
     def self.included(klass)
diff --git a/lib/diaspora/websocket.rb b/lib/diaspora/websocket.rb
index af0684e77..a66e49159 100644
--- a/lib/diaspora/websocket.rb
+++ b/lib/diaspora/websocket.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 module Diaspora
   module WebSocket
     def self.initialize_channels
diff --git a/lib/encryptable.rb b/lib/encryptable.rb
index 4c39a129e..92a50be99 100644
--- a/lib/encryptable.rb
+++ b/lib/encryptable.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
   module Encryptable
    def signable_string
      raise NotImplementedException("Override this in your encryptable class")
diff --git a/lib/encryptor.rb b/lib/encryptor.rb
index d80aecb15..87fb5c7e5 100644
--- a/lib/encryptor.rb
+++ b/lib/encryptor.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 module Encryptor
   module Public
     def encrypt cleartext
diff --git a/lib/hcard.rb b/lib/hcard.rb
index e8c1c2110..66825c0b5 100644
--- a/lib/hcard.rb
+++ b/lib/hcard.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 module HCard
   def self.find url
     doc = Nokogiri::HTML(Net::HTTP.get URI.parse(url))
diff --git a/lib/message_handler.rb b/lib/message_handler.rb
index 8f97e53c3..96ab244dc 100644
--- a/lib/message_handler.rb
+++ b/lib/message_handler.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 class MessageHandler 
 
   
diff --git a/lib/mongo_mapper/bson_id.rb b/lib/mongo_mapper/bson_id.rb
index 6a6b1928e..2cf4d2fe5 100644
--- a/lib/mongo_mapper/bson_id.rb
+++ b/lib/mongo_mapper/bson_id.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 class String
   def to_id
     BSON::ObjectId self
diff --git a/lib/mongo_mapper/clear_dev_memory.rb b/lib/mongo_mapper/clear_dev_memory.rb
index aebf675dc..501ce55ac 100644
--- a/lib/mongo_mapper/clear_dev_memory.rb
+++ b/lib/mongo_mapper/clear_dev_memory.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 module MongoMapper
   class ClearDevMemory
     def initialize(app)
diff --git a/lib/salmon/salmon.rb b/lib/salmon/salmon.rb
index c1e14c021..a8a7e0bd1 100644
--- a/lib/salmon/salmon.rb
+++ b/lib/salmon/salmon.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 # Add URL safe Base64 support
 module Base64
   module_function
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index fceb99430..23d13d136 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 namespace :db do
   desc 'Seed the current RAILS_ENV database from db/seeds.rb'
   namespace :seed do
diff --git a/lib/tasks/rspec.rake b/lib/tasks/rspec.rake
index 14ca3ea47..2594f9277 100644
--- a/lib/tasks/rspec.rake
+++ b/lib/tasks/rspec.rake
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 begin
   require 'rspec/core'
   require 'rspec/core/rake_task'
diff --git a/lib/tasks/saucelabs_adapter.rake b/lib/tasks/saucelabs_adapter.rake
index e9c32be08..307e295e2 100644
--- a/lib/tasks/saucelabs_adapter.rake
+++ b/lib/tasks/saucelabs_adapter.rake
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require 'saucelabs_adapter/run_utils'
 
 class Rake::Task
diff --git a/public/javascripts/aspect-edit.js b/public/javascripts/aspect-edit.js
index a6b62b2a3..872549b0c 100644
--- a/public/javascripts/aspect-edit.js
+++ b/public/javascripts/aspect-edit.js
@@ -1,3 +1,22 @@
+/*   Copyright 2010 Diaspora Inc.
+ *
+ *   This file is part of Diaspora.
+ *
+ *   Diaspora is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Diaspora is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
 $('#move_friends_link').live( 'click', function(){
   $.post('/aspects/move_friends',
     { 'moves' : $('#aspect_list').data() },
diff --git a/public/javascripts/fancybox/blank.gif b/public/javascripts/fancybox/blank.gif
index 35d42e808..35d42e808 100644..100755
--- a/public/javascripts/fancybox/blank.gif
+++ b/public/javascripts/fancybox/blank.gif
diff --git a/public/javascripts/fancybox/fancy_close.png b/public/javascripts/fancybox/fancy_close.png
index 07035307a..07035307a 100644..100755
--- a/public/javascripts/fancybox/fancy_close.png
+++ b/public/javascripts/fancybox/fancy_close.png
diff --git a/public/javascripts/fancybox/fancy_loading.png b/public/javascripts/fancybox/fancy_loading.png
index 250301796..250301796 100644..100755
--- a/public/javascripts/fancybox/fancy_loading.png
+++ b/public/javascripts/fancybox/fancy_loading.png
diff --git a/public/javascripts/fancybox/fancy_nav_left.png b/public/javascripts/fancybox/fancy_nav_left.png
index ebaa6a4fd..ebaa6a4fd 100644..100755
--- a/public/javascripts/fancybox/fancy_nav_left.png
+++ b/public/javascripts/fancybox/fancy_nav_left.png
diff --git a/public/javascripts/fancybox/fancy_nav_right.png b/public/javascripts/fancybox/fancy_nav_right.png
index 873294e96..873294e96 100644..100755
--- a/public/javascripts/fancybox/fancy_nav_right.png
+++ b/public/javascripts/fancybox/fancy_nav_right.png
diff --git a/public/javascripts/fancybox/fancy_shadow_e.png b/public/javascripts/fancybox/fancy_shadow_e.png
index 2eda08936..2eda08936 100644..100755
--- a/public/javascripts/fancybox/fancy_shadow_e.png
+++ b/public/javascripts/fancybox/fancy_shadow_e.png
diff --git a/public/javascripts/fancybox/fancy_shadow_n.png b/public/javascripts/fancybox/fancy_shadow_n.png
index 69aa10e23..69aa10e23 100644..100755
--- a/public/javascripts/fancybox/fancy_shadow_n.png
+++ b/public/javascripts/fancybox/fancy_shadow_n.png
diff --git a/public/javascripts/fancybox/fancy_shadow_ne.png b/public/javascripts/fancybox/fancy_shadow_ne.png
index 79f6980a3..79f6980a3 100644..100755
--- a/public/javascripts/fancybox/fancy_shadow_ne.png
+++ b/public/javascripts/fancybox/fancy_shadow_ne.png
diff --git a/public/javascripts/fancybox/fancy_shadow_nw.png b/public/javascripts/fancybox/fancy_shadow_nw.png
index 7182cd938..7182cd938 100644..100755
--- a/public/javascripts/fancybox/fancy_shadow_nw.png
+++ b/public/javascripts/fancybox/fancy_shadow_nw.png
diff --git a/public/javascripts/fancybox/fancy_shadow_s.png b/public/javascripts/fancybox/fancy_shadow_s.png
index d8858bfb7..d8858bfb7 100644..100755
--- a/public/javascripts/fancybox/fancy_shadow_s.png
+++ b/public/javascripts/fancybox/fancy_shadow_s.png
diff --git a/public/javascripts/fancybox/fancy_shadow_se.png b/public/javascripts/fancybox/fancy_shadow_se.png
index 541e3ffd3..541e3ffd3 100644..100755
--- a/public/javascripts/fancybox/fancy_shadow_se.png
+++ b/public/javascripts/fancybox/fancy_shadow_se.png
diff --git a/public/javascripts/fancybox/fancy_shadow_sw.png b/public/javascripts/fancybox/fancy_shadow_sw.png
index b451689fa..b451689fa 100644..100755
--- a/public/javascripts/fancybox/fancy_shadow_sw.png
+++ b/public/javascripts/fancybox/fancy_shadow_sw.png
diff --git a/public/javascripts/fancybox/fancy_shadow_w.png b/public/javascripts/fancybox/fancy_shadow_w.png
index 8a4e4a887..8a4e4a887 100644..100755
--- a/public/javascripts/fancybox/fancy_shadow_w.png
+++ b/public/javascripts/fancybox/fancy_shadow_w.png
diff --git a/public/javascripts/fancybox/fancy_title_left.png b/public/javascripts/fancybox/fancy_title_left.png
index 6049223d1..6049223d1 100644..100755
--- a/public/javascripts/fancybox/fancy_title_left.png
+++ b/public/javascripts/fancybox/fancy_title_left.png
diff --git a/public/javascripts/fancybox/fancy_title_main.png b/public/javascripts/fancybox/fancy_title_main.png
index 8044271f2..8044271f2 100644..100755
--- a/public/javascripts/fancybox/fancy_title_main.png
+++ b/public/javascripts/fancybox/fancy_title_main.png
diff --git a/public/javascripts/fancybox/fancy_title_over.png b/public/javascripts/fancybox/fancy_title_over.png
index d9f458f4b..d9f458f4b 100644..100755
--- a/public/javascripts/fancybox/fancy_title_over.png
+++ b/public/javascripts/fancybox/fancy_title_over.png
diff --git a/public/javascripts/fancybox/fancy_title_right.png b/public/javascripts/fancybox/fancy_title_right.png
index e36d9db2a..e36d9db2a 100644..100755
--- a/public/javascripts/fancybox/fancy_title_right.png
+++ b/public/javascripts/fancybox/fancy_title_right.png
diff --git a/public/javascripts/fancybox/fancybox-x.png b/public/javascripts/fancybox/fancybox-x.png
index c2130f869..c2130f869 100644..100755
--- a/public/javascripts/fancybox/fancybox-x.png
+++ b/public/javascripts/fancybox/fancybox-x.png
diff --git a/public/javascripts/fancybox/fancybox-y.png b/public/javascripts/fancybox/fancybox-y.png
index 7ef399b99..7ef399b99 100644..100755
--- a/public/javascripts/fancybox/fancybox-y.png
+++ b/public/javascripts/fancybox/fancybox-y.png
diff --git a/public/javascripts/fancybox/fancybox.png b/public/javascripts/fancybox/fancybox.png
index 65e14f68f..65e14f68f 100644..100755
--- a/public/javascripts/fancybox/fancybox.png
+++ b/public/javascripts/fancybox/fancybox.png
diff --git a/public/javascripts/fancybox/jquery.easing-1.3.pack.js b/public/javascripts/fancybox/jquery.easing-1.3.pack.js
index 9028179e7..9028179e7 100644..100755
--- a/public/javascripts/fancybox/jquery.easing-1.3.pack.js
+++ b/public/javascripts/fancybox/jquery.easing-1.3.pack.js
diff --git a/public/javascripts/fancybox/jquery.fancybox-1.3.1.css b/public/javascripts/fancybox/jquery.fancybox-1.3.1.css
index 28bbb1327..28bbb1327 100644..100755
--- a/public/javascripts/fancybox/jquery.fancybox-1.3.1.css
+++ b/public/javascripts/fancybox/jquery.fancybox-1.3.1.css
diff --git a/public/javascripts/fancybox/jquery.fancybox-1.3.1.js b/public/javascripts/fancybox/jquery.fancybox-1.3.1.js
index 2209ceadc..688f93aa3 100644..100755
--- a/public/javascripts/fancybox/jquery.fancybox-1.3.1.js
+++ b/public/javascripts/fancybox/jquery.fancybox-1.3.1.js
@@ -1074,4 +1074,4 @@
 		fancybox_init();

 	});

 

-})(jQuery);

+})(jQuery);
\ No newline at end of file
diff --git a/public/javascripts/fancybox/jquery.fancybox-1.3.1.pack.js b/public/javascripts/fancybox/jquery.fancybox-1.3.1.pack.js
index 8421d53a6..8421d53a6 100644..100755
--- a/public/javascripts/fancybox/jquery.fancybox-1.3.1.pack.js
+++ b/public/javascripts/fancybox/jquery.fancybox-1.3.1.pack.js
diff --git a/public/javascripts/fancybox/jquery.mousewheel-3.0.2.pack.js b/public/javascripts/fancybox/jquery.mousewheel-3.0.2.pack.js
index b950db1a2..b950db1a2 100644..100755
--- a/public/javascripts/fancybox/jquery.mousewheel-3.0.2.pack.js
+++ b/public/javascripts/fancybox/jquery.mousewheel-3.0.2.pack.js
diff --git a/public/javascripts/image_picker.js b/public/javascripts/image_picker.js
index 7324d680c..d4e719260 100644
--- a/public/javascripts/image_picker.js
+++ b/public/javascripts/image_picker.js
@@ -1,3 +1,22 @@
+/*   Copyright 2010 Diaspora Inc.
+ *
+ *   This file is part of Diaspora.
+ *
+ *   Diaspora is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Diaspora is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
 $(document).ready( function() {
     $('div#image_picker div.small_photo').click( function() {
       $('#image_url_field').val($(this).attr('id'));
diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js
index ba442a831..f826c9d3f 100644
--- a/public/javascripts/stream.js
+++ b/public/javascripts/stream.js
@@ -1,3 +1,22 @@
+/*   Copyright 2010 Diaspora Inc.
+ *
+ *   This file is part of Diaspora.
+ *
+ *   Diaspora is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Diaspora is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
 $(document).ready(function(){
 	$('.comment_set').each(function(index) {
       var $this = $(this);
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index b72a9fa72..0c0ed1a4e 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -1,3 +1,22 @@
+/*   Copyright 2010 Diaspora Inc.
+ *
+ *   This file is part of Diaspora.
+ *
+ *   Diaspora is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Diaspora is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
 $(document).ready(function(){
 	
 	$('#debug_info').click(function() {
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 92c9c8408..99f07051b 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -466,6 +466,7 @@ h1.big_text {
         background-color: #444444;
         border: 1px solid #555555;
         padding: 3px 8px;
+          padding-bottom: 2px;
         color: #999999; }
         #aspect_nav ul > li a:hover {
           background-color: #555555;
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 445979917..786d9faa6 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -1,3 +1,22 @@
+//   Copyright 2010 Diaspora Inc.
+//
+//   This file is part of Diaspora.
+//
+//   Diaspora is free software: you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   Diaspora is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+
 @font-face
   :font-family 'BrandonGrotesqueLightRegular'
   :src url('brandongrotesque_light/Brandon_light-webfont.eot')
@@ -609,6 +628,7 @@ h1.big_text
         :border 1px solid #555
 
         :padding 3px 8px
+          :bottom 2px
         :color #999
 
         &:hover
diff --git a/public/stylesheets/sass/sessions.sass b/public/stylesheets/sass/sessions.sass
index 810450a6f..10fb82fd3 100644
--- a/public/stylesheets/sass/sessions.sass
+++ b/public/stylesheets/sass/sessions.sass
@@ -1,3 +1,23 @@
+//   Copyright 2010 Diaspora Inc.
+//
+//   This file is part of Diaspora.
+//
+//   Diaspora is free software: you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   Diaspora is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+
+
 @font-face
   :font-family 'BrandonGrotesqueLightRegular'
   :src url('brandongrotesque_light/Brandon_light-webfont.eot')
diff --git a/public/stylesheets/sass/ui.sass b/public/stylesheets/sass/ui.sass
index 57057a31a..7050c3330 100644
--- a/public/stylesheets/sass/ui.sass
+++ b/public/stylesheets/sass/ui.sass
@@ -1,3 +1,22 @@
+//   Copyright 2010 Diaspora Inc.
+//
+//   This file is part of Diaspora.
+//
+//   Diaspora is free software: you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   Diaspora is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+
 .button, .button_set
   :font
     :family "Lucida Grande", sans-serif
diff --git a/spec/controllers/aspects_controller_spec.rb b/spec/controllers/aspects_controller_spec.rb
index fffddd1fb..57e40a217 100644
--- a/spec/controllers/aspects_controller_spec.rb
+++ b/spec/controllers/aspects_controller_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
 include ApplicationHelper 
 describe AspectsController do
diff --git a/spec/controllers/people_controller_spec.rb b/spec/controllers/people_controller_spec.rb
index 5eb052c23..26a72615d 100644
--- a/spec/controllers/people_controller_spec.rb
+++ b/spec/controllers/people_controller_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
  
 describe PeopleController do
diff --git a/spec/controllers/publics_controller_spec.rb b/spec/controllers/publics_controller_spec.rb
index 69c79bcb6..4b62dddbd 100644
--- a/spec/controllers/publics_controller_spec.rb
+++ b/spec/controllers/publics_controller_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
  
 describe PublicsController do
diff --git a/spec/controllers/requests_controller_spec.rb b/spec/controllers/requests_controller_spec.rb
index eaa0b72de..348916334 100644
--- a/spec/controllers/requests_controller_spec.rb
+++ b/spec/controllers/requests_controller_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
 include ApplicationHelper 
 include RequestsHelper 
diff --git a/spec/controllers/sockets_controller_spec.rb b/spec/controllers/sockets_controller_spec.rb
index 3e60c62e7..369b203a5 100644
--- a/spec/controllers/sockets_controller_spec.rb
+++ b/spec/controllers/sockets_controller_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 class SocketsController
diff --git a/spec/factories.rb b/spec/factories.rb
index bb8c8eedb..73cd6decf 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 #For Guidance
 #http://github.com/thoughtbot/factory_girl
 # http://railscasts.com/episodes/158-factories-not-fixtures
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index bb886bd83..4d23da3c1 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 include ApplicationHelper 
diff --git a/spec/helpers/publics_helper_spec.rb b/spec/helpers/publics_helper_spec.rb
index bdc9c8250..1a8c46165 100644
--- a/spec/helpers/publics_helper_spec.rb
+++ b/spec/helpers/publics_helper_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 include PublicsHelper 
diff --git a/spec/helpers/requests_helper_spec.rb b/spec/helpers/requests_helper_spec.rb
index 325597bf3..d879de6ae 100644
--- a/spec/helpers/requests_helper_spec.rb
+++ b/spec/helpers/requests_helper_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 include RequestsHelper
diff --git a/spec/lib/diaspora_parser_spec.rb b/spec/lib/diaspora_parser_spec.rb
index feec817f2..5cc106fed 100644
--- a/spec/lib/diaspora_parser_spec.rb
+++ b/spec/lib/diaspora_parser_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 include ApplicationHelper 
diff --git a/spec/lib/hcard_spec.rb b/spec/lib/hcard_spec.rb
index 6092e4dab..38048ab9c 100644
--- a/spec/lib/hcard_spec.rb
+++ b/spec/lib/hcard_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
 require File.dirname(__FILE__) + '/../../lib/hcard'
 
diff --git a/spec/lib/message_handler_spec.rb b/spec/lib/message_handler_spec.rb
index ba13f8fef..88e256f2d 100644
--- a/spec/lib/message_handler_spec.rb
+++ b/spec/lib/message_handler_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe MessageHandler do
diff --git a/spec/lib/salmon_salmon_spec.rb b/spec/lib/salmon_salmon_spec.rb
index c48e5db15..7077b7727 100644
--- a/spec/lib/salmon_salmon_spec.rb
+++ b/spec/lib/salmon_salmon_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Salmon do
diff --git a/spec/lib/web_hooks_spec.rb b/spec/lib/web_hooks_spec.rb
index 7a14152bc..c8062e4ad 100644
--- a/spec/lib/web_hooks_spec.rb
+++ b/spec/lib/web_hooks_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 include Diaspora
diff --git a/spec/misc_spec.rb b/spec/misc_spec.rb
index 9e9d61efa..8979a5b8f 100644
--- a/spec/misc_spec.rb
+++ b/spec/misc_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/spec_helper'
  
 describe 'making sure the spec runner works' do
diff --git a/spec/models/album_spec.rb b/spec/models/album_spec.rb
index 751d1427f..c787dc4c8 100644
--- a/spec/models/album_spec.rb
+++ b/spec/models/album_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Album do
diff --git a/spec/models/aspect_spec.rb b/spec/models/aspect_spec.rb
index 67e7a0c94..d62b53787 100644
--- a/spec/models/aspect_spec.rb
+++ b/spec/models/aspect_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Aspect do
diff --git a/spec/models/comments_spec.rb b/spec/models/comments_spec.rb
index 0d394bc5c..e4c5b8f6b 100644
--- a/spec/models/comments_spec.rb
+++ b/spec/models/comments_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Comment do
diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb
index 6cc3a8716..be6b536bb 100644
--- a/spec/models/person_spec.rb
+++ b/spec/models/person_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Person do
diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb
index 1fccdd6c8..85208067d 100644
--- a/spec/models/photo_spec.rb
+++ b/spec/models/photo_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Photo do
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index a1c391657..526151e25 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Post do
diff --git a/spec/models/profile_spec.rb b/spec/models/profile_spec.rb
index 819ef3e44..b2a2bc46e 100644
--- a/spec/models/profile_spec.rb
+++ b/spec/models/profile_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Profile do
diff --git a/spec/models/request_spec.rb b/spec/models/request_spec.rb
index 24e748a5f..863a6691a 100644
--- a/spec/models/request_spec.rb
+++ b/spec/models/request_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Request do 
diff --git a/spec/models/retraction_spec.rb b/spec/models/retraction_spec.rb
index 889d85fa9..75a3abb50 100644
--- a/spec/models/retraction_spec.rb
+++ b/spec/models/retraction_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Retraction do
diff --git a/spec/models/status_message_spec.rb b/spec/models/status_message_spec.rb
index af58ecea8..b810c3609 100644
--- a/spec/models/status_message_spec.rb
+++ b/spec/models/status_message_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe StatusMessage do
diff --git a/spec/models/user/posting_spec.rb b/spec/models/user/posting_spec.rb
index 74fb8c2cf..43ef6e368 100644
--- a/spec/models/user/posting_spec.rb
+++ b/spec/models/user/posting_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe User do
diff --git a/spec/models/user/receive_spec.rb b/spec/models/user/receive_spec.rb
index fe432959b..ecdb155ae 100644
--- a/spec/models/user/receive_spec.rb
+++ b/spec/models/user/receive_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe User do
diff --git a/spec/models/user/user_friending_spec.rb b/spec/models/user/user_friending_spec.rb
index bd7293358..ad31042f1 100644
--- a/spec/models/user/user_friending_spec.rb
+++ b/spec/models/user/user_friending_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe User do
diff --git a/spec/models/user/visible_posts_spec.rb b/spec/models/user/visible_posts_spec.rb
index e948a98a6..7edd9b2eb 100644
--- a/spec/models/user/visible_posts_spec.rb
+++ b/spec/models/user/visible_posts_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe User do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 8727d290e..b99cde95d 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe User do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index b85fc7f5a..abc3ce1b5 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 # This file is copied to ~/spec when you run 'ruby script/generate rspec'
 # from the project root directory.
 
diff --git a/spec/user_encryption_spec.rb b/spec/user_encryption_spec.rb
index ca2d28977..eba1de905 100644
--- a/spec/user_encryption_spec.rb
+++ b/spec/user_encryption_spec.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.dirname(__FILE__) + '/spec_helper'
 include ApplicationHelper
 include Diaspora::Parser
diff --git a/test/performance/browsing_test.rb b/test/performance/browsing_test.rb
index 867fc8c98..da1a15bd4 100644
--- a/test/performance/browsing_test.rb
+++ b/test/performance/browsing_test.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require 'test_helper'
 require 'rails/performance_test_help'
 
diff --git a/test/selenium/login_test.rb b/test/selenium/login_test.rb
index 102985a97..9959c8f6b 100644
--- a/test/selenium/login_test.rb
+++ b/test/selenium/login_test.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 class SampleWebratTest < ActionController::IntegrationTest
 
   def test_widget
diff --git a/test/selenium/selenium_suite.rb b/test/selenium/selenium_suite.rb
index 2734b4309..940fb57c1 100644
--- a/test/selenium/selenium_suite.rb
+++ b/test/selenium/selenium_suite.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
 require 'test/unit/ui/console/testrunner'
 require 'webrat'
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 22895cbd0..53d531878 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,3 +1,23 @@
+#    Copyright 2010 Diaspora Inc.
+#
+#    This file is part of Diaspora.
+#
+#    Diaspora is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Diaspora is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with Diaspora.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
 ENV["RAILS_ENV"] = "test"
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'