diff --git a/.travis.yml b/.travis.yml
index 68008293e..57533b850 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,44 +1,36 @@
-# Copyright (C) 
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+sudo: required
+dist: trusty
 
 language: cpp
+compiler:
+  - clang
 
 git:
   depth: 1
 
-branches:
-  only:
-    - master
-
-compiler:
-  - clang
-  - gcc ## Uncomment when we are up to full c++11 standards.
-
 before_install:
-  - sudo add-apt-repository ppa:kalakris/cmake -y
-  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-  - sudo add-apt-repository 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.7 main'
-  - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
-  - sudo apt-get update -qq
-  - sudo apt-get install clang-3.7
-  - sudo apt-get install libace-dev
-  - sudo apt-get install libncurses5-dev
-  - sudo apt-get install build-essential autoconf libtool make cmake git-core patch wget links zip unzip unrar
-  - sudo apt-get install openssl libssl-dev mysql-server mysql-client libmysqlclient15-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev
-  - if [ "$CXX" = "clang++" ]; then sudo apt-get install -qq libstdc++-4.8-dev; fi
-  - if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi
-  - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8; fi
-  - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
-  
+  - sudo apt-get -qq install build-essential libtool make cmake cmake-data openssl
+  - sudo apt-get -qq install libssl-dev libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev libace-dev
+  - sudo apt-get -qq install mysql-server
+  - git config user.email "travis@build.bot" && git config user.name "Travis CI"
+  - git tag -a -m "Travis build" init
+
+install:
+  - mysql -uroot -e 'create database test_mysql;'
+  - cd bin
+  - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=0 -DSCRIPTS=1 -DSERVERS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=check_install
+  - cd ..
+
 script:
-  - mkdir build
-  - cd build
-  - cmake ../ -DSCRIPTS=1 -DTOOLS=1
-  - make -j8
\ No newline at end of file
+  - $CXX --version
+  - mysql -uroot < data/sql/create/create_mysql.sql
+  - cat data/sql/base/db_auth/*.sql | mysql -uacore -pacore auth
+  - cat data/sql/base/db_characters/*.sql | mysql -uacore -pacore characters
+  - cat data/sql/base/db_world/*.sql | mysql -uacore -pacore world
+  - cat data/sql/updates/db_auth/*.sql | mysql -uacore -pacore auth
+  - cat data/sql/updates/db_characters/*.sql | mysql -uacore -pacore characters
+  - cat data/sql/updates/db_world/*.sql | mysql -uacore -pacore world
+  - mysql -uroot < data/sql/create/drop_mysql.sql
+  - cd bin
+  - make -j 8 -k && make install
+  - cd check_install/bin
diff --git a/README.md b/README.md
index 2e26bf623..a56835a71 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # ![logo](https://raw.githubusercontent.com/azerothcore/azerothcore.github.io/master/images/logo-github.png) AzerothCore
 
 [![Gitter](https://badges.gitter.im/azerothcore/azerothcore.svg)](https://gitter.im/azerothcore/azerothcore?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=40032087)](https://www.bountysource.com/teams/azerothcore/bounties) [![Issue Stats](http://www.issuestats.com/github/AzerothCore/azerothcore-wotlk/badge/issue)](http://www.issuestats.com/github/AzerothCore/azerothcore-wotlk) [![Issue Stats](http://www.issuestats.com/github/AzerothCore/azerothcore-wotlk/badge/pr)](http://www.issuestats.com/github/AzerothCore/azerothcore-wotlk)
+[![Master Build Status](https://travis-ci.org/azerothcore/azerothcore-wotlk.svg)](https://travis-ci.org/azerothcore/azerothcore)
 
 ## Introduction
 
diff --git a/bin/db_assembler/db_assembler.sh b/bin/db_assembler/db_assembler.sh
index c060988b6..74902ab72 100755
--- a/bin/db_assembler/db_assembler.sh
+++ b/bin/db_assembler/db_assembler.sh
@@ -27,22 +27,25 @@ fi
 
 function assemble() {
     # to lowercase
-    database=$1
+    database=${1,,}
     start_sql=$2
     with_base=$3
     with_updates=$4
     with_custom=$5
 
-    var_base="DB_"$database"_PATHS"
-    base=${!var_base}
+    uc=${database^^}
 
-    var_updates="DB_"$database"_UPDATE_PATHS"
-    updates=${!var_updates}
+    name="DB_"$uc"_PATHS"
+    v="$name[@]"
+    base=("${!v}")
 
-    var_custom="DB_"$database"_CUSTOM_PATHS"
-    custom=${!var_custom}
+    name="DB_"$uc"_UPDATE_PATHS"
+    v="$name[@]"
+    updates=("${!v}")
 
-    echo $updates
+    name='DB_'$uc'_CUSTOM_PATHS'
+    v="$name[@]"
+    custom=("${!v}")
 
 
     suffix_base="_base"
@@ -95,11 +98,12 @@ function assemble() {
                         n="registry__$hash"
                         if [[ -z ${!n} ]]; then
                             if [ ! -e $updFile ]; then
-                                echo "" > $updFile
+                                echo "-- assembled updates" > $updFile
                             fi
 
                             printf -v "registry__${hash}" %s "$file"
                             echo "-- New update sql: "$file
+                            echo "-- $file"
                             cat "$entry" >> $updFile
                         fi
                     done
@@ -109,7 +113,7 @@ function assemble() {
     fi
 
     if [ $with_custom = true ]; then
-        custFile=$OUTPUT_FOLDER$database$suffix_custom"_"$curTime".sql"
+        custFile=$OUTPUT_FOLDER$database$suffix_custom".sql"
 
         if [ ! ${#custom[@]} -eq 0 ]; then
             echo "Generating $OUTPUT_FOLDER$database$suffix_custom ..."
@@ -124,19 +128,12 @@ function assemble() {
                             continue
                         fi
 
-                        file=$(basename "$entry")
-                        hash=$($MD5_CMD "$entry")
-                        hash="${hash%% *}" #remove file path
-                        n="registry__$hash"
-                        if [[ -z ${!n} ]]; then
-                            if [ ! -e $custFile ]; then
-                                echo "" > $custFile
-                            fi
-
-                            printf -v "registry__${hash}" %s "$file"
-                            echo "-- New custom sql: "$file
-                            cat "$entry" >> $custFile
+                        if [[ ! -e $custFile ]]; then
+                            echo "-- assembled custom" > "$custFile"
                         fi
+
+                        echo "-- $file" >> $custFile
+                        cat "$entry" >> $custFile
                     done
                 fi
             done
@@ -145,24 +142,24 @@ function assemble() {
 }
 
 function run() {
-	echo "===== STARTING PROCESS ====="
+    echo "===== STARTING PROCESS ====="
 
-		mkdir -p $OUTPUT_FOLDER
+        mkdir -p $OUTPUT_FOLDER
 
-		for db in ${DATABASES[@]}
-		do
-			assemble "$db" $version".sql" $1 $2 $3
-		done
+        for db in ${DATABASES[@]}
+        do
+            assemble "$db" $version".sql" $1 $2 $3
+        done
 
-		echo "" > $reg_file
+        echo "" > $reg_file
 
-		for k in ${!registry__*}
-		do
-		  n=$k
-		  echo "$k='${!n}';" >> "$reg_file"
-		done
+        for k in ${!registry__*}
+        do
+          n=$k
+          echo "$k='${!n}';" >> "$reg_file"
+        done
 
-	echo "===== DONE ====="
+    echo "===== DONE ====="
 }
 
 PS3='Please enter your choice: '
@@ -182,11 +179,11 @@ do
             run false true false
             break #avoid loop
             ;;
-		"Create only customs")
+        "Create only customs")
             run false false true
             break #avoid loop
             ;;
-		"Clean registry")
+        "Clean registry")
             rm "$reg_file"
             break #avoid loop
             ;;
diff --git a/bin/db_pendings/import.sh b/bin/db_pendings/import.sh
index f3ed764ba..cf85cd349 100755
--- a/bin/db_pendings/import.sh
+++ b/bin/db_pendings/import.sh
@@ -89,7 +89,7 @@ function import() {
                 echo "DROP PROCEDURE IF EXISTS \`updateDb\`;" >> "$newFile";
             fi;
 
-            #rm $entry;
+            rm $entry;
 
             oldDate=$dateToday
             oldCnt=$cnt
diff --git a/bin/runners/run-engine b/bin/runners/run-engine
old mode 100755
new mode 100644
diff --git a/data/sql/create/create_mysql.sql b/data/sql/create/create_mysql.sql
new file mode 100644
index 000000000..8d2e47cb4
--- /dev/null
+++ b/data/sql/create/create_mysql.sql
@@ -0,0 +1,13 @@
+GRANT USAGE ON * . * TO 'acore'@'localhost' IDENTIFIED BY 'acore' WITH MAX_QUERIES_PER_HOUR 0 MAX_CONNECTIONS_PER_HOUR 0 MAX_UPDATES_PER_HOUR 0 ;
+
+CREATE DATABASE `world` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+
+CREATE DATABASE `characters` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+
+CREATE DATABASE `auth` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+
+GRANT ALL PRIVILEGES ON `world` . * TO 'acore'@'localhost' WITH GRANT OPTION;
+
+GRANT ALL PRIVILEGES ON `characters` . * TO 'acore'@'localhost' WITH GRANT OPTION;
+
+GRANT ALL PRIVILEGES ON `auth` . * TO 'acore'@'localhost' WITH GRANT OPTION;
\ No newline at end of file
diff --git a/data/sql/create/drop_mysql.sql b/data/sql/create/drop_mysql.sql
new file mode 100644
index 000000000..90f33cb01
--- /dev/null
+++ b/data/sql/create/drop_mysql.sql
@@ -0,0 +1,21 @@
+REVOKE ALL PRIVILEGES ON * . * FROM 'acore'@'localhost';
+
+REVOKE ALL PRIVILEGES ON `world` . * FROM 'acore'@'localhost';
+
+REVOKE GRANT OPTION ON `world` . * FROM 'acore'@'localhost';
+
+REVOKE ALL PRIVILEGES ON `characters` . * FROM 'acore'@'localhost';
+
+REVOKE GRANT OPTION ON `characters` . * FROM 'acore'@'localhost';
+
+REVOKE ALL PRIVILEGES ON `auth` . * FROM 'acore'@'localhost';
+
+REVOKE GRANT OPTION ON `auth` . * FROM 'acore'@'localhost';
+
+DROP USER 'acore'@'localhost';
+
+DROP DATABASE IF EXISTS `world`;
+
+DROP DATABASE IF EXISTS `characters`;
+
+DROP DATABASE IF EXISTS `auth`;
diff --git a/data/sql/updates/db_world/2016_08_26_00.sql b/data/sql/updates/db_world/2016_08_26_00.sql
index 0c610dbde..8ebf2c151 100644
--- a/data/sql/updates/db_world/2016_08_26_00.sql
+++ b/data/sql/updates/db_world/2016_08_26_00.sql
@@ -1,3 +1,3 @@
-ALTER TABLE version_db_database CHANGE COLUMN 2016_08_25_00 2016_08_26_00 bit;
+ALTER TABLE version_db_world CHANGE COLUMN 2016_08_25_00 2016_08_26_00 bit;
 
 DELETE FROM command WHERE name IN ('npc evade', 'debug send chatmessage');
diff --git a/data/sql/updates/pending_db_auth/create_sql.sh b/data/sql/updates/pending_db_auth/create_sql.sh
old mode 100644
new mode 100755
diff --git a/data/sql/updates/pending_db_characters/create_sql.sh b/data/sql/updates/pending_db_characters/create_sql.sh
old mode 100644
new mode 100755
diff --git a/data/sql/updates/pending_db_world/2016_08_27_01.sql b/data/sql/updates/pending_db_world/2016_08_27_01.sql
new file mode 100644
index 000000000..32be61bf0
--- /dev/null
+++ b/data/sql/updates/pending_db_world/2016_08_27_01.sql
@@ -0,0 +1,11 @@
+/*
+Issue: Not work quest id 10990 10991 10992 #114
+NPCs spawns are inside the Gobjs
+*/
+
+UPDATE gameobject_template SET AIName="SmartGameObjectAI", ScriptName = "" /*go_shrine_of_the_birds*/ WHERE entry IN (185551,185547,185553);
+DELETE FROM smart_scripts WHERE entryorguid IN (185551,185547,185553) AND source_type=1;
+INSERT INTO smart_scripts VALUES
+(185551,1,0,0,70,0,100,0,2,0,0,0,12,22992,7,60000,0,0,0,7,0,0,0,0,0,0,0,"Hawk Shrine - On Activate - Summon Creature 22992"),
+(185547,1,0,0,70,0,100,0,2,0,0,0,12,22993,7,60000,0,0,0,7,0,0,0,0,0,0,0,"Eagle Shrine - On Gossip Hello - Summon Creature 22993"),
+(185553,1,0,0,70,0,100,0,2,0,0,0,12,22994,7,60000,0,0,0,7,0,0,0,0,0,0,0,"Hawk Shrine - On Gossip Hello - Summon Creature 22994");
\ No newline at end of file
diff --git a/data/sql/updates/pending_db_world/create_sql.sh b/data/sql/updates/pending_db_world/create_sql.sh
old mode 100644
new mode 100755
diff --git a/src/game/Movement/Spline/MoveSpline.cpp b/src/game/Movement/Spline/MoveSpline.cpp
index 22ea15a42..684c14e1a 100644
--- a/src/game/Movement/Spline/MoveSpline.cpp
+++ b/src/game/Movement/Spline/MoveSpline.cpp
@@ -1,18 +1,7 @@
 /*
  * Copyright (C) 2016+     AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  */
 
 #include "MoveSpline.h"
diff --git a/src/game/Movement/Spline/MoveSpline.h b/src/game/Movement/Spline/MoveSpline.h
index 94ce57d70..b8df80953 100644
--- a/src/game/Movement/Spline/MoveSpline.h
+++ b/src/game/Movement/Spline/MoveSpline.h
@@ -1,18 +1,7 @@
 /*
  * Copyright (C) 2016+     AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  */
 
 #ifndef TRINITYSERVER_MOVEPLINE_H
diff --git a/src/game/Movement/Spline/MoveSplineFlag.h b/src/game/Movement/Spline/MoveSplineFlag.h
index c85a1aeb4..7c5da0f39 100644
--- a/src/game/Movement/Spline/MoveSplineFlag.h
+++ b/src/game/Movement/Spline/MoveSplineFlag.h
@@ -1,18 +1,7 @@
 /*
  * Copyright (C) 2016+     AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  */
 
 #ifndef TRINITYSERVER_MOVESPLINEFLAG_H
diff --git a/src/game/Movement/Spline/MoveSplineInit.cpp b/src/game/Movement/Spline/MoveSplineInit.cpp
index e23fa9ceb..345517e9d 100644
--- a/src/game/Movement/Spline/MoveSplineInit.cpp
+++ b/src/game/Movement/Spline/MoveSplineInit.cpp
@@ -1,18 +1,7 @@
 /*
  * Copyright (C) 2016+     AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  */
 
 #include "MoveSplineInit.h"
diff --git a/src/game/Movement/Spline/MoveSplineInit.h b/src/game/Movement/Spline/MoveSplineInit.h
index 72dc220f9..83a03eaef 100644
--- a/src/game/Movement/Spline/MoveSplineInit.h
+++ b/src/game/Movement/Spline/MoveSplineInit.h
@@ -1,18 +1,7 @@
 /*
  * Copyright (C) 2016+     AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  */
 
 #ifndef TRINITYSERVER_MOVESPLINEINIT_H
diff --git a/src/game/Movement/Spline/MoveSplineInitArgs.h b/src/game/Movement/Spline/MoveSplineInitArgs.h
index 11663934f..edde1fbf0 100644
--- a/src/game/Movement/Spline/MoveSplineInitArgs.h
+++ b/src/game/Movement/Spline/MoveSplineInitArgs.h
@@ -1,18 +1,7 @@
 /*
  * Copyright (C) 2016+     AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  */
 
 #ifndef TRINITYSERVER_MOVESPLINEINIT_ARGS_H
diff --git a/src/game/Movement/Spline/MovementPacketBuilder.cpp b/src/game/Movement/Spline/MovementPacketBuilder.cpp
index 66d2a5385..a9efd5259 100644
--- a/src/game/Movement/Spline/MovementPacketBuilder.cpp
+++ b/src/game/Movement/Spline/MovementPacketBuilder.cpp
@@ -1,18 +1,7 @@
 /*
  * Copyright (C) 2016+     AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  */
 
 #include "MovementPacketBuilder.h"
diff --git a/src/game/Movement/Spline/MovementPacketBuilder.h b/src/game/Movement/Spline/MovementPacketBuilder.h
index a28ff0b44..66f3074c3 100644
--- a/src/game/Movement/Spline/MovementPacketBuilder.h
+++ b/src/game/Movement/Spline/MovementPacketBuilder.h
@@ -1,20 +1,9 @@
 /*
  * Copyright (C) 2016+     AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  */
-
+ 
 #ifndef TRINITYSERVER_PACKET_BUILDER_H
 #define TRINITYSERVER_PACKET_BUILDER_H
 
diff --git a/src/game/Movement/Spline/MovementTypedefs.h b/src/game/Movement/Spline/MovementTypedefs.h
index d9d2077d8..f28c075a1 100644
--- a/src/game/Movement/Spline/MovementTypedefs.h
+++ b/src/game/Movement/Spline/MovementTypedefs.h
@@ -1,18 +1,7 @@
 /*
  * Copyright (C) 2016+     AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  */
 
 #ifndef TRINITYSERVER_TYPEDEFS_H
diff --git a/src/game/Movement/Spline/MovementUtil.cpp b/src/game/Movement/Spline/MovementUtil.cpp
index d973dfbe3..c7b6e4b60 100644
--- a/src/game/Movement/Spline/MovementUtil.cpp
+++ b/src/game/Movement/Spline/MovementUtil.cpp
@@ -1,18 +1,7 @@
 /*
  * Copyright (C) 2016+     AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  */
 
 #include "MoveSplineFlag.h"
diff --git a/src/game/Movement/Spline/Spline.cpp b/src/game/Movement/Spline/Spline.cpp
index 5d78e151b..88ddb4853 100644
--- a/src/game/Movement/Spline/Spline.cpp
+++ b/src/game/Movement/Spline/Spline.cpp
@@ -1,18 +1,7 @@
 /*
  * Copyright (C) 2016+     AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  */
 
 #include "Spline.h"
diff --git a/src/game/Movement/Spline/Spline.h b/src/game/Movement/Spline/Spline.h
index b413142f4..8084c18e1 100644
--- a/src/game/Movement/Spline/Spline.h
+++ b/src/game/Movement/Spline/Spline.h
@@ -1,18 +1,7 @@
 /*
  * Copyright (C) 2016+     AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  */
 
 #ifndef TRINITYSERVER_SPLINE_H
diff --git a/src/game/Movement/Spline/SplineImpl.h b/src/game/Movement/Spline/SplineImpl.h
index 026a2d7d3..1cd60707e 100644
--- a/src/game/Movement/Spline/SplineImpl.h
+++ b/src/game/Movement/Spline/SplineImpl.h
@@ -1,18 +1,7 @@
 /*
  * Copyright (C) 2016+     AzerothCore <www.azerothcore.org>, released under GNU GPL v2 license: http://github.com/azerothcore/azerothcore-wotlk/LICENSE-GPL2
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/>
+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  */
 
 namespace Movement
diff --git a/src/scripts/World/go_scripts.cpp b/src/scripts/World/go_scripts.cpp
index 5b6840b93..e994ff879 100644
--- a/src/scripts/World/go_scripts.cpp
+++ b/src/scripts/World/go_scripts.cpp
@@ -448,7 +448,7 @@ public:
 /*######
 ## go_shrine_of_the_birds
 ######*/
-
+/*
 enum ShrineOfTheBirds
 {
     NPC_HAWK_GUARD      = 22992,
@@ -490,7 +490,7 @@ public:
         return false;
     }
 };
-
+*/
 /*######
 ## go_southfury_moonstone
 ######*/
@@ -1182,7 +1182,7 @@ void AddSC_go_scripts()
     // Theirs
     new go_cat_figurine();
     new go_gilded_brazier();
-    new go_shrine_of_the_birds();
+    //new go_shrine_of_the_birds();
     new go_southfury_moonstone();
     new go_tablet_of_madness();
     new go_tablet_of_the_seven();