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

Conflicts:
	MediaPortal_Bon/MediaPortal_Bon.sdf
	MediaPortal_Bon/MediaPortal_Bon.suo