merge from dev

publish

-git stash
-git checkout gh-pages
-git merge dev -m "merge from dev"
-grunt
+echo -e "\033[0;33;1mPublish start."
+echo -e "\033[0;33;1m  > Checking out gh-pages\033[0m"
+git checkout -q gh-pages
+
+echo -e "\033[0;33;1m  > Merging dev commits\033[0m"
+git merge dev -qm "merge from dev"
+
+echo -e "\033[0;33;1m  > Building dist js files\033[0m"
+grunt -q > GRUNT_OUTPUT
+rm -f GRUNT_OUTPUT
+
 git add dist
-git commit -m "publish"
+
+echo -e "\033[0;33;1m  > Commit dist js files\033[0m"
+git commit -qm "publish"
+
+echo -e "\033[0;33;1m  > Pusing to git...\033[0m"
 git push origin gh-pages
-git checkout dev
-git stash pop
+
+git checkout -q dev
+echo -e "\033[0;33;1mPublish done.\033[0m"
\ No newline at end of file