Settings rename
Merge branch 's2k13' of github.com:graphpaperpress/sell-media into s2k13