CS6 & CC
Merge branch 'master' of https://github.com/kieranpblack/velositey

Conflicts:
	CC/Extension/Velositey/content/Velositey.assets/Images/ci1-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ci1-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ci1-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ci2-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ci2-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ci2-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ci3-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ci3-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ci3-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/dg1-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/dg1-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/dg1-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/fe1-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/fe1-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/fe1-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ff1-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ff1-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ff1-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ff2-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ff2-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ff2-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ff3-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ff3-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ff3-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g1-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g1-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g1-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g10-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g10-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g10-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g2-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g2-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g2-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g3-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g3-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g3-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g4-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g4-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g4-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g5-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g5-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g5-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g6-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g6-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g6-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g7-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g7-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g7-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g8-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g8-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g8-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g9-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g9-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/g9-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lc1-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lc1-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lc1-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lc2-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lc2-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lc2-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lc3-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lc3-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lc3-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lc4-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lc4-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lc4-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf1-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf1-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf1-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf10-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf10-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf10-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf11-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf11-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf11-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf2-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf2-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf2-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf3-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf3-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf3-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf4-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf4-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf4-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf5-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf5-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf5-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf6-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf6-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf6-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf7-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf7-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf7-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf8-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf8-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf8-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf9-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf9-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lf9-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lh1-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lh1-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lh1-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lh2-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lh2-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lh2-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lh3-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lh3-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lh3-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lh4-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lh4-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lh4-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lh5-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lh5-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/lh5-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ls1-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ls1-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ls1-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ls2-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ls2-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ls2-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ls3-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ls3-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ls3-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ls4-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ls4-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ls4-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ls5-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ls5-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ls5-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ms1-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ms1-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ms1-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ms2-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ms2-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ms2-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ms3-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ms3-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/ms3-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/nt1-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/nt1-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/nt1-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/re1-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/re1-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/re1-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/re2-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/re2-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/re2-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/re3-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/re3-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/re3-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/sp1-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/sp1-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/sp1-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/sp2-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/sp2-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/sp2-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/sp3-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/sp3-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/sp3-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/spr-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/spr-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/spr-u.png
	CC/Extension/Velositey/content/Velositey.assets/Images/vt1-d.png
	CC/Extension/Velositey/content/Velositey.assets/Images/vt1-o.png
	CC/Extension/Velositey/content/Velositey.assets/Images/vt1-u.png

CC/Extension/Velositey/content/Velositey.assets/Locales/en_US/dictionary
.xml

CC/Extension/Velositey/content/Velositey.assets/Scripts/ActionToJavascri
pt.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Add .JPG.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Add .PNG.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Add .SVG.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/AddGuide.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Array
Generator 1-0-0.jsx

CC/Extension/Velositey/content/Velositey.assets/Scripts/ChangeFontStyles
.jsx

CC/Extension/Velositey/content/Velositey.assets/Scripts/ChangeShapeLayer
Colour.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Check 13px.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/ClearGuides.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Content-1.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Content-2.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Content-3.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Content-4.jsx

CC/Extension/Velositey/content/Velositey.assets/Scripts/CreateGuides.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Delete All
Empty Layers.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Distribute
Horizontal.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Distribute
Vertical.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Font List.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Font Names.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Font Sizes.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/FontInfo.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Footer-1.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Footer-10.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Footer-11.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Footer-2.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Footer-3.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Footer-4.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Footer-5.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Footer-6.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Footer-7.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Footer-8.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Footer-9.jsx

CC/Extension/Velositey/content/Velositey.assets/Scripts/GroupDimensions-
Beta.jsx

CC/Extension/Velositey/content/Velositey.assets/Scripts/Guide-AllCenter.
jsx

CC/Extension/Velositey/content/Velositey.assets/Scripts/Guide-AllSides.j
sx

CC/Extension/Velositey/content/Velositey.assets/Scripts/Guide-Bottom.jsx

CC/Extension/Velositey/content/Velositey.assets/Scripts/Guide-HCenter.js
x
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Guide-Left.jsx

CC/Extension/Velositey/content/Velositey.assets/Scripts/Guide-LeftRight.
jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Guide-Right.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Guide-Top.jsx

CC/Extension/Velositey/content/Velositey.assets/Scripts/Guide-TopBottom.
jsx

CC/Extension/Velositey/content/Velositey.assets/Scripts/Guide-VCenter.js
x
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Header-1.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Header-2.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Header-3.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Header-4.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Header-5.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/MeasureBoth.jsx

CC/Extension/Velositey/content/Velositey.assets/Scripts/MeasureHeight.js
x

CC/Extension/Velositey/content/Velositey.assets/Scripts/MeasureSelection
.jsx

CC/Extension/Velositey/content/Velositey.assets/Scripts/MeasureWidth.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/NavBar-1.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/NavBar-2.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Rasterise All
Smart Objects.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Remove All
Empty Groups.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Remove All
Unused Layer Styles.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/SVG TEST.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/SaveJPG.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Slider-1.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Slider-2.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Slider-3.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Slider-4.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/Slider-5.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/SpecKing
Test.jsx

CC/Extension/Velositey/content/Velositey.assets/Scripts/UnderThirteen.js
x
	CC/Extension/Velositey/content/Velositey.assets/Scripts/favicon.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/main.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/mapicon.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/newTemplate.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/saveIcon.jsx
	CC/Extension/Velositey/content/Velositey.assets/Scripts/stdlib.js

CC/Extension/Velositey/content/Velositey.assets/Templates/content-other.
psd
	CC/Extension/Velositey/content/Velositey.assets/Templates/content.psd

CC/Extension/Velositey/content/Velositey.assets/Templates/faviconTemplat
e.psd
	CC/Extension/Velositey/content/Velositey.assets/Templates/footer.psd
	CC/Extension/Velositey/content/Velositey.assets/Templates/header.psd

CC/Extension/Velositey/content/Velositey.assets/Templates/mapiconTemplat
e.psd
	CC/Extension/Velositey/content/Velositey.assets/Templates/slider.psd

CC/Extension/Velositey/content/Velositey.assets/bundles/PHSP-14/PHSP14Bu
ndle.swf_
	CC/Extension/Velositey/content/Velositey.jsx
	CC/Extension/Velositey/content/Velositey.swf
	CC/Extension/Velositey/content/Velositey.xml
	README.md
Readme