Removed max from Pre & Post padding minutes
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/livetvnewrecording.html
	MediaBrowser.WebDashboard/dashboard-ui/livetvseriestimer.html
	MediaBrowser.WebDashboard/dashboard-ui/livetvtimer.html
Merge pull request #947 from SvenVandenbrande/master

Removed max from Pre & Post padding minutes