Merge branch 'release/1.4.1' into develop
updating dist files
fix merge conflicts with generated files
Merge branch 'hotfix/#7.2' into develop
Merge branch 'master' into develop
formatting
jshint errors after updating
add original xhr as a property on the error object used to reject the deferred
document the xhr property of the rejection reason
formatting options-test
testing to make sure xhr is provided
adding verboseResolution option
adding bower.json for the switch and incrementing version numbers to 1.5.0
re-running build to update dates
Merge branch 'release/1.5.0'