media manager slots
Merge branch 'master' of https://github.com/dlees/LMP

Conflicts:
	LMP.pro.user