added all the assets into the asset pipeline
Patricks script desigh
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/global.js
	app/views/dashboard/excel.html.erb