Ui changes
Merge branch 'master' of https://github.com/DrJid/Scripts

Conflicts:
	Scripts.xcodeproj/project.xcworkspace/xcshareddata/Scripts.xccheckout