Fixed font swatches
Removed template name from image directories
Updated ReadMe
Conflict resolution
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Added Dropbox
Merge branch 'develop'
Merge branch 'develop'
Merged develop into master