Nascop Dashboard design
Merge branch 'master' of https://github.com/jgat2012/NASCOPf

Conflicts:
	assets/CSS/style.css
	assets/cache/13795926287b0bbd27a4acf15a38e2865ca72cbe4f.css
	assets/cache/13850610097b0bbd27a4acf15a38e2865ca72cbe4f.css
	assets/cache/13870254397b0bbd27a4acf15a38e2865ca72cbe4f.css