Added advanced SASS grid
Merge branch 'master' of https://github.com/Lhari/indeWildStar
Grid rework
	modified:   gulpfile.js
	modified:   index.html
	new file:   sass/assets/_shame.scss
	modified:   sass/general/_content.scss
	modified:   sass/general/_header.scss
	new file:   sass/general/_menu.scss
	modified:   sass/general/_nav.scss
	modified:   sass/general/_sidenav.scss
	deleted:    sass/general/_slider.scss
	modified:   sass/general/global.scss
	modified:   sass/main.scss
	new file:   sass/modules/_slider.scss
	deleted:    sass/responsive/1kb-1024-grid.scss
	modified:   sass/responsive/_grid.scss
	new file:   sass/settings/_vars.scss
	new file:   sass/settings/vars.scss
	modified:   stylesheets/fontello.css
	modified:   stylesheets/general/global.css
	modified:   stylesheets/main.css
	modified:   stylesheets/min.main.css
	deleted:    stylesheets/responsive/1kb-1024-grid.css
	new file:   stylesheets/settings/vars.css
Update as a Joomla template
	modified:   templates/WildStar/index.html
	deleted:    templates/WildStar/sass/assets/_shame.scss
	deleted:    templates/WildStar/sass/fontello.scss
	deleted:    templates/WildStar/sass/general/_content.scss
	deleted:    templates/WildStar/sass/general/_header.scss
	deleted:    templates/WildStar/sass/general/_menu.scss
	deleted:    templates/WildStar/sass/general/_nav.scss
	deleted:    templates/WildStar/sass/general/_sidenav.scss
	deleted:    templates/WildStar/sass/general/global.scss
	deleted:    templates/WildStar/sass/main.scss
	deleted:    templates/WildStar/sass/modules/_members.scss
	deleted:    templates/WildStar/sass/modules/_recruitment.scss
	deleted:    templates/WildStar/sass/modules/_slider.scss
	deleted:    templates/WildStar/sass/responsive/_grid.scss
	deleted:    templates/WildStar/sass/settings/_vars.scss
	deleted:    templates/WildStar/sass/settings/vars.scss

	templates/WildStar.zip
	templates/_WildStar/
	templates/wildstar/.gitattributes
	templates/wildstar/README.md
	templates/wildstar/components/
	templates/wildstar/html/
	templates/wildstar/images/headers/
	templates/wildstar/language/
	templates/wildstar/layouts/
	templates/wildstar/media/
	templates/wildstar/modules/
	templates/wildstar/plugins/
	templates/wildstar/templateDetails.xml
	templates/wildstar/templates/
Update .gitignore
Joomla template update
	new file:   templates/WildStar/index.php
	new file:   templates/WildStar/sass/assets/_shame.scss
	new file:   templates/WildStar/sass/fontello.scss
	new file:   templates/WildStar/sass/general/_content.scss
	new file:   templates/WildStar/sass/general/_header.scss
	new file:   templates/WildStar/sass/general/_menu.scss
	new file:   templates/WildStar/sass/general/_nav.scss
	new file:   templates/WildStar/sass/general/_sidenav.scss
	new file:   templates/WildStar/sass/general/global.scss
	new file:   templates/WildStar/sass/main.scss
	new file:   templates/WildStar/sass/modules/_members.scss
	new file:   templates/WildStar/sass/modules/_recruitment.scss
	new file:   templates/WildStar/sass/modules/_slider.scss
	new file:   templates/WildStar/sass/responsive/_grid.scss
	new file:   templates/WildStar/sass/settings/_vars.scss
	new file:   templates/WildStar/sass/settings/vars.scss
	new file:   templates/WildStar/templateDetails.xml
	templates/wildstar/html/
Update .gitignore
Finalizig joomla template update
	new file:   templates/WildStar/html/mod_login/default.php
	new file:   templates/WildStar/html/mod_login/index.html
Massive SCSS upgrade
	modified:   templates/WildStar/font/fontello.eot
	modified:   templates/WildStar/font/fontello.svg
	modified:   templates/WildStar/font/fontello.ttf
	modified:   templates/WildStar/font/fontello.woff
	modified:   templates/WildStar/gulpfile.js
	modified:   templates/WildStar/html/mod_login/default.php
	modified:   templates/WildStar/index.html
	modified:   templates/WildStar/index.php
	renamed:    templates/WildStar/js/app.top.js -> templates/WildStar/js/all.top.js
	renamed:    templates/WildStar/js/app.top.min.js -> templates/WildStar/js/all.top.min.js
	modified:   templates/WildStar/js/partials/script.js
	new file:   templates/WildStar/sass/assets/_button.scss
	new file:   templates/WildStar/sass/assets/_form.scss
	modified:   templates/WildStar/sass/general/_content.scss
	renamed:    templates/WildStar/sass/fontello.scss -> templates/WildStar/sass/general/_fontello.scss
	renamed:    templates/WildStar/sass/general/global.scss -> templates/WildStar/sass/general/_global.scss
	modified:   templates/WildStar/sass/general/_header.scss
	modified:   templates/WildStar/sass/general/_menu.scss
	deleted:    templates/WildStar/sass/general/_nav.scss
	modified:   templates/WildStar/sass/general/_sidenav.scss
	modified:   templates/WildStar/sass/main.scss
	modified:   templates/WildStar/sass/modules/_members.scss
	modified:   templates/WildStar/sass/modules/_recruitment.scss
	modified:   templates/WildStar/sass/modules/_slider.scss
	modified:   templates/WildStar/sass/settings/_vars.scss
	deleted:    templates/WildStar/sass/settings/vars.scss
	deleted:    templates/WildStar/stylesheets/fontello.css
	deleted:    templates/WildStar/stylesheets/general/global.css
	modified:   templates/WildStar/stylesheets/main.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Binary diff