upd
Merge branch 'master' of github.com:xbmc-now/MPB

Conflicts:
	EpgDataCap_Bon/EpgDataCap_Bon.suo