Piiiiieee
Forgot to commit these fucken merge conflicts great just great
All the things :(
Merge branch 'master' of github.com:Zomxilla/danae

Conflicts:
	.idea/workspace.xml
	js/IE8.combined.min.js
	js/main.js
	js/main.min.js
	js/thirdparty.combined.min.js
	node_modules/grunt-bower-task/node_modules/bower/node_modules/abbrev/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/archy/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/bower-config/lib/Config.js
	node_modules/grunt-bower-task/node_modules/bower/node_modules/bower-config/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/bower-endpoint-parser/index.js
	node_modules/grunt-bower-task/node_modules/bower/node_modules/bower-endpoint-parser/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/bower-endpoint-parser/test/test.js
	node_modules/grunt-bower-task/node_modules/bower/node_modules/bower-json/node_modules/deep-extend/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/decompress-zip/node_modules/graceful-fs/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/decompress-zip/node_modules/nopt/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/decompress-zip/node_modules/readable-stream/node_modules/isarray/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/decompress-zip/node_modules/touch/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/decompress-zip/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/fstream-ignore/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/fstream/lib/reader.js
	node_modules/grunt-bower-task/node_modules/bower/node_modules/fstream/node_modules/graceful-fs/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/fstream/node_modules/inherits/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/fstream/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/glob/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/handlebars/node_modules/uglify-js/node_modules/source-map/node_modules/amdefine/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/handlebars/node_modules/uglify-js/node_modules/source-map/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/inquirer/node_modules/mute-stream/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/osenv/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/request/node_modules/form-data/lib/form_data.js
	node_modules/grunt-bower-task/node_modules/bower/node_modules/request/node_modules/form-data/node_modules/async/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/request/node_modules/form-data/node_modules/combined-stream/Readme.md
	node_modules/grunt-bower-task/node_modules/bower/node_modules/request/node_modules/form-data/node_modules/combined-stream/lib/combined_stream.js
	node_modules/grunt-bower-task/node_modules/bower/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/request/node_modules/form-data/node_modules/combined-stream/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/request/node_modules/form-data/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/request/node_modules/http-signature/node_modules/asn1/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/request/node_modules/http-signature/node_modules/assert-plus/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/retry/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/tar/README.md
	node_modules/grunt-bower-task/node_modules/bower/node_modules/tar/lib/parse.js
	node_modules/grunt-bower-task/node_modules/bower/node_modules/tar/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/tar/test/extract.js
	node_modules/grunt-bower-task/node_modules/bower/node_modules/tmp/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/configstore/node_modules/graceful-fs/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/configstore/node_modules/js-yaml/node_modules/argparse/node_modules/underscore.string/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/configstore/node_modules/mkdirp/node_modules/minimist/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/configstore/node_modules/mkdirp/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/configstore/node_modules/object-assign/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/configstore/node_modules/osenv/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/configstore/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/form-data/lib/form_data.js
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/form-data/node_modules/async/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/form-data/node_modules/combined-stream/Readme.md
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/form-data/node_modules/combined-stream/lib/combined_stream.js
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/form-data/node_modules/combined-stream/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/form-data/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/http-signature/node_modules/asn1/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/http-signature/node_modules/assert-plus/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/mime/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/node-uuid/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/tunnel-agent/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/request/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/semver/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/semver/semver.browser.js
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/semver/semver.browser.js.gz
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/semver/semver.js
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/semver/semver.min.js
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/semver/semver.min.js.gz
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/node_modules/semver/test/index.js
	node_modules/grunt-bower-task/node_modules/bower/node_modules/update-notifier/package.json
	node_modules/grunt-bower-task/node_modules/bower/node_modules/which/package.json
	node_modules/grunt-bower-task/node_modules/colors/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/abbrev/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/archy/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/bower-config/lib/Config.js
	node_modules/grunt-bower/node_modules/bower/node_modules/bower-config/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/bower-endpoint-parser/index.js
	node_modules/grunt-bower/node_modules/bower/node_modules/bower-endpoint-parser/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/bower-endpoint-parser/test/test.js
	node_modules/grunt-bower/node_modules/bower/node_modules/bower-json/node_modules/deep-extend/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/decompress-zip/node_modules/binary/node_modules/chainsaw/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/decompress-zip/node_modules/graceful-fs/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/decompress-zip/node_modules/nopt/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/decompress-zip/node_modules/readable-stream/node_modules/isarray/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/decompress-zip/node_modules/touch/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/decompress-zip/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/fstream-ignore/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/fstream/lib/reader.js
	node_modules/grunt-bower/node_modules/bower/node_modules/fstream/node_modules/graceful-fs/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/fstream/node_modules/inherits/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/fstream/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/glob/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/handlebars/node_modules/uglify-js/node_modules/source-map/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/inquirer/node_modules/mute-stream/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/osenv/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/request/node_modules/aws-sign/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/request/node_modules/forever-agent/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/request/node_modules/form-data/lib/form_data.js
	node_modules/grunt-bower/node_modules/bower/node_modules/request/node_modules/form-data/node_modules/async/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/request/node_modules/form-data/node_modules/combined-stream/Readme.md
	node_modules/grunt-bower/node_modules/bower/node_modules/request/node_modules/form-data/node_modules/combined-stream/lib/combined_stream.js
	node_modules/grunt-bower/node_modules/bower/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/request/node_modules/form-data/node_modules/combined-stream/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/request/node_modules/form-data/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/request/node_modules/http-signature/node_modules/asn1/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/request/node_modules/http-signature/node_modules/assert-plus/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/request/node_modules/mime/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/request/node_modules/node-uuid/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/request/node_modules/tunnel-agent/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/retry/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/tar/README.md
	node_modules/grunt-bower/node_modules/bower/node_modules/tar/lib/parse.js
	node_modules/grunt-bower/node_modules/bower/node_modules/tar/node_modules/inherits/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/tar/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/tar/test/extract.js
	node_modules/grunt-bower/node_modules/bower/node_modules/tmp/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/configstore/node_modules/graceful-fs/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/configstore/node_modules/js-yaml/node_modules/argparse/node_modules/underscore.string/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/configstore/node_modules/mkdirp/node_modules/minimist/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/configstore/node_modules/mkdirp/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/configstore/node_modules/object-assign/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/configstore/node_modules/osenv/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/configstore/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/aws-sign2/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/form-data/lib/form_data.js
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/form-data/node_modules/async/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/form-data/node_modules/combined-stream/Readme.md
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/form-data/node_modules/combined-stream/lib/combined_stream.js
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/form-data/node_modules/combined-stream/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/form-data/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/http-signature/node_modules/asn1/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/http-signature/node_modules/assert-plus/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/http-signature/node_modules/ctype/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/request/node_modules/tunnel-agent/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/request/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/semver/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/semver/semver.browser.js
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/semver/semver.browser.js.gz
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/semver/semver.js
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/semver/semver.min.js
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/semver/semver.min.js.gz
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/node_modules/semver/test/index.js
	node_modules/grunt-bower/node_modules/bower/node_modules/update-notifier/package.json
	node_modules/grunt-bower/node_modules/bower/node_modules/which/package.json
	node_modules/grunt-bower/node_modules/bower/package.json
	node_modules/grunt-bower/package.json
	node_modules/grunt-contrib-compass/node_modules/tmp/package.json
	node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/async/package.json
	node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/optimist/package.json
	node_modules/grunt-contrib-uglify/node_modules/uglify-js/node_modules/source-map/package.json
	node_modules/grunt-contrib-uglify/node_modules/uglify-js/package.json
	node_modules/grunt-contrib-watch/node_modules/gaze/node_modules/globule/node_modules/glob/node_modules/inherits/package.json
	node_modules/grunt-contrib-watch/node_modules/tiny-lr/package.json
	node_modules/grunt/node_modules/async/package.json
	node_modules/grunt/node_modules/colors/package.json
	node_modules/grunt/node_modules/eventemitter2/README.md
	node_modules/grunt/node_modules/eventemitter2/lib/eventemitter2.js
	node_modules/grunt/node_modules/eventemitter2/package.json
	node_modules/grunt/node_modules/rimraf/package.json
	node_modules/grunt/package.json
	stylesheets/css/style.css