Update is_mobile to help decifer the user agent for the iPad. Both is_desktop and is_mobile is true for the iPad. Update so if is_desktop and is_mobile is true and mobile type contains "Generic" then the device will render as desktop
Merge branch '2.2/develop' of github.com:bloveless/pyrocms into 2.2/develop