using new controller for my sets page
Merge branch 'master' of https://github.com/theprinc/StredmiOS

Conflicts:
	StredmiOS/PlayerView.m