remove jquery from asset pipeline
Merge branch 'master' of github.com:HoustonCP/HCP2

Conflicts:
	app/assets/javascripts/application.js