# Conflicts:
#	README.md
#	provider/assets/javascripts/jquery.min.js
#	provider/assets/javascripts/jquery.min.map
#	provider/assets/js/jquery.js
#	provider/assets/js/jquery_ujs.js