Merge branch 'master' of try.gogits.org:lunny/gogs

Conflicts:
	.gitignore
	LICENSE

diff --cc .gitignore
index 425f227c1adc177e1beec4b50016cce6ef3b2011,6cd1df2b7a3b5cd99e60d82ef18f486a3ef8d922..0544836208364f8e94a7f1a42f694786bce83e82
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,12 -1,22 +1,35 @@@
- public/img/avatar/
 +gogs
 +*.exe
 +*.exe~
 +.DS_Store
 +*.db
 +*.log
 +custom/
 +data/
 +.vendor/
 +.idea/
 +*.iml
 -*.exe
++public/img/avatar/
++
+ # Compiled Object files, Static and Dynamic libs (Shared Objects)
+ *.o
+ *.a
+ *.so
+ 
+ # Folders
+ _obj
+ _test
+ 
+ # Architecture specific extensions/prefixes
+ *.[568vq]
+ [568vq].out
+ 
+ *.cgo1.go
+ *.cgo2.c
+ _cgo_defun.c
+ _cgo_gotypes.go
+ _cgo_export.*
+ 
+ _testmain.go
+ 
++*.exe

diff --cc LICENSE
index 7cecc2485f49c50150f76751a5105ec7870c1c12,3af16b07244e7a5d640d983760ce09566e8734cb..bd6517e2dde063d3df075807551ba99bf308f33b
--- 1/LICENSE
--- 2/LICENSE
+++ b/LICENSE
@@@ -1,19 -1,27 +1,27 @@@
- Copyright (c) 2011 Dmitriy Zaporozhets
+ Copyright (c) 2014
+ All rights reserved.
  
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
  
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
  
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+ 
+ * Neither the name of the {organization} nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.